Commits · 518fc7e7be7cf700193e8748fb26e02b59ad4972 · zhangyusheng / YX_IDENT_REFACTORING

04 Dec, 2018 1 commit
- Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_REFACTORING into dev · 518fc7e7
  Administrator authored Dec 04, 2018
  
  518fc7e7
03 Dec, 2018 2 commits
- Merge remote-tracking branch 'origin/dev' into dev · 00a640b3
  Administrator authored Dec 03, 2018
  
  00a640b3
- 修改了通过地市,区县,派出所查询派出所申领表 · b263c7b7
  Administrator authored Dec 03, 2018
  
  b263c7b7
27 Nov, 2018 6 commits
- Merge remote-tracking branch 'origin/dev' into dev · 50f6e2e5
  xuwang authored Nov 27, 2018
  
  50f6e2e5
- 完成通过视图查询卡基统计报表 · 16c34d84
  xuwang authored Nov 27, 2018
```
查询在受理库任务单详情
```
  16c34d84
- 完成通过视图查询卡基统计报表 · 81654509
  xuwang authored Nov 27, 2018
```
查询在受理库任务单详情
```
  81654509
- Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_REFACTORING into dev · 311afa64
  Administrator authored Nov 27, 2018
  
  311afa64
- push · c53e9e1a
  Administrator authored Nov 27, 2018
  
  c53e9e1a
- 下载装箱单并连接盈信库 · b817ff81
  Administrator authored Nov 27, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
查询交接单
```
  b817ff81
22 Nov, 2018 3 commits
- 修改bug · e9c481a0
  liboyang authored Nov 22, 2018
  
  e9c481a0
- Merge remote-tracking branch 'origin/dev' into dev · 070443a7
  liboyang authored Nov 22, 2018
  
  070443a7
- 修改bug · 91614877
  liboyang authored Nov 22, 2018
  
  91614877
20 Nov, 2018 10 commits
- Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_REFACTORING into dev · 67e09846
  xuwang authored Nov 20, 2018
  
  67e09846
- pull · fea7f976
  xuwang authored Nov 20, 2018
  
  fea7f976
- Merge remote-tracking branch 'origin/dev' into dev · 51213b5f
  Administrator authored Nov 20, 2018
  
  51213b5f
- 下载装箱单并连接盈信库 · d65c69bc
  Administrator authored Nov 20, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
查询交接单
```
  d65c69bc
- 编写页面 · b0884e93
  Administrator authored Nov 20, 2018
  
  b0884e93
- Merge remote-tracking branch 'origin/dev' into dev · b53ecaf6
  Administrator authored Nov 20, 2018
```
# Conflicts:
#	src/main/java/com/yxproject/start/entity/CountyListInfoEntity.java
#	src/main/java/com/yxproject/start/service/impl/TaskServiceImpl.java
```
  b53ecaf6
- 下载装箱单并连接盈信库 · b4b3adcf
  Administrator authored Nov 20, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
```
  b4b3adcf
- 下载装箱单并连接盈信库 · 359d1836
  Administrator authored Nov 20, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
```
  359d1836
- 下载装箱单并连接盈信库 · b2a253d0
  Administrator authored Nov 20, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
```
  b2a253d0
- 更新实体对应字段 · 60d0b2da
  Administrator authored Nov 20, 2018
  
  60d0b2da
19 Nov, 2018 14 commits

Merge remote-tracking branch 'origin/dev' into dev · 17dccbab

Administrator authored Nov 19, 2018

# Conflicts:
#	src/main/java/com/yxproject/start/api/AdminApi.java
#	src/main/java/com/yxproject/start/api/UserApi.java

17dccbab

push · de04730a
Administrator authored Nov 19, 2018

de04730a
下载装箱单并连接盈信库 · 14857152
Administrator authored Nov 19, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
```
14857152
下载装箱单并连接盈信库 · 52c3ee46
Administrator authored Nov 19, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
```
52c3ee46
Merge remote-tracking branch 'origin/dev' into dev · 6bef8517
Administrator authored Nov 19, 2018

6bef8517

Merge remote-tracking branch 'origin/dev' into dev · 02557039

Administrator authored Nov 19, 2018

# Conflicts:
#	pom.xml
#	src/main/java/com/yxproject/start/api/ShiroApi.java
#	src/main/java/com/yxproject/start/config/JerseyConfig.java
#	src/main/java/com/yxproject/start/entity/GroupinfoEntity.java
#	src/main/java/com/yxproject/start/entity/ProductionTaskListEntity.java
#	src/main/java/com/yxproject/start/mapper/GroupinfoMapper.java
#	src/main/java/com/yxproject/start/mapper/ProductionTaskListMapper.java
#	src/main/java/com/yxproject/start/service/ProductionTaskListService.java
#	src/main/java/com/yxproject/start/service/impl/TaskServiceImpl.java
#	src/main/resources/application.properties
#	src/main/resources/mapper/GroupinfoMapper.xml
#	src/main/resources/mapper/ProductionTaskListMapper.xml

02557039

删除没有用的代码 · 1b4297e6
liboyang authored Nov 19, 2018

1b4297e6
删除没有用的代码 · 2052a2ea
liboyang authored Nov 19, 2018

2052a2ea
下载装箱单并连接盈信库 · feead0f3
Administrator authored Nov 19, 2018
```
更新异常状态并更新异常信息
更新出库时间和入库时间
```
feead0f3
整合页面 · fe728525
liboyang authored Nov 19, 2018

fe728525
整合完成 · d16f6b79
liboyang authored Nov 19, 2018

d16f6b79
整合完成 · 5d871a1d
liboyang authored Nov 19, 2018

5d871a1d
前后端分离 · 972cc0e7
liboyang authored Nov 19, 2018

972cc0e7
更新数据库规范 · 0806c189
Administrator authored Nov 19, 2018
```
 更新与数据库对应的实体
```
0806c189

12 Nov, 2018 1 commit
- 更新文档 · f08b7894
  Administrator authored Nov 12, 2018
  
  f08b7894
08 Nov, 2018 3 commits
- Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_REFACTORING into dev · a2d94781
  Administrator authored Nov 08, 2018
```
# Conflicts:
#	src/main/java/com/yxproject/start/api/UserInfoApi.java
```
  a2d94781
- push · a25d8490
  Administrator authored Nov 08, 2018
  
  a25d8490
- 添加查询区县列表 · ade1220f
  Administrator authored Nov 08, 2018
```
添加下载装箱单
修改添加快证的制证流程
修改数据库表结构 增加受理号表
```
  ade1220f