修改了countyList的FINISH_COUNT,改为(IN_STORAGE_COUNT + OUT_STORAGE_COUNT) AS FINISH_COUNT;

修改交接单页面、
修改报表页面

修改交接单页面

# 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