# Conflicts:
#	src/main/resources/static/tpl/layout/permissionList/permissionList.html
#	src/main/resources/static/tpl/layout/permissionList/permissionList.js
#	src/main/resources/static/tpl/layout/userList/userList.js

# Conflicts:
#	src/main/java/com/yxproject/start/mapper/TaskMapper.java

添加了下载回执单的接口

添加了County的实体,Service,Impl;
修改了CityList,County,TypeList的xml和mapper;
添加了ReceiptList的实体,Service,Impl,修改了下载交接单的sql

添加了County的实体,Service,Impl;
添加了TypeList的实体,Service,Impl;
修改了CityList,County,TypeList的xml和mapper

# Conflicts:
#	src/main/resources/mapper/GroupNoMapper.xml

添加更新入库页面
添加交接单页面
修改查询生产统计报表页面

添加查询证件页面
添加受理信息页面
添加特殊证件页面