# 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

更新异常状态并更新异常信息
更新出库时间和入库时间

 更新与数据库对应的实体

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

添加下载装箱单
修改添加快证的制证流程
修改数据库表结构 增加受理号表

添加下载装箱单

修改mybatis注解改为xml
添加查询任务单详情通过状态
添加查询废证详情通过状态
添加保存废证、更新废证

# Conflicts:
#	制证调度系统—详细设计说明书.doc

# Conflicts:
#	制证调度系统—测试分析报告.doc
#	制证调度系统—软件需求说明书.doc

更新任务单详情
查询多库证件信息
添加快证制证流程

# Conflicts:
#	src/main/java/com/yxproject/start/api/ShiroApi.java
#	src/main/java/com/yxproject/start/mapper/SysPermissionMapper.java

配置受理库和制证库数据源

配置受理库和制证库数据源

查询任务单
生成任务单

# Conflicts:
#	src/main/java/com/yxproject/start/Main.java
#	src/main/java/com/yxproject/start/api/UserInfoApi.java
#	src/main/java/com/yxproject/start/config/MyShiroRealm.java
#	src/main/resources/application.properties
#	src/main/resources/mapper/SysPermissionMapper.xml
#	src/main/resources/mapper/SystemUserMapper.xml

# Conflicts:
#	src/main/java/com/yxproject/start/Main.java
#	src/main/java/com/yxproject/start/api/UserInfoApi.java
#	src/main/java/com/yxproject/start/config/MyShiroRealm.java
#	src/main/resources/application.properties
#	src/main/resources/mapper/SysPermissionMapper.xml
#	src/main/resources/mapper/SystemUserMapper.xml