Merge origin/master

Conflicts:
	src/java/com/jskj/assets/server/entity/Yimiaoyanshoutb.java
	src/java/com/jskj/assets/server/entity/YimiaoyanshoutbExample.java
	src/java/com/jskj/assets/server/mapper/YimiaoyanshoutbMapper.xml
	web/WEB-INF/sql脚本/YMGL数据库.sql
Merge origin/master

Conflicts:
	src/java/com/jskj/assets/server/entity/Yimiaoyanshoutb.java
	src/java/com/jskj/assets/server/entity/YimiaoyanshoutbExample.java
	src/java/com/jskj/assets/server/mapper/YimiaoyanshoutbMapper.xml
	web/WEB-INF/sql脚本/YMGL数据库.sql
Merge origin/master

Conflicts:
	src/java/com/jskj/assets/server/entity/Yimiaoyanshoutb.java
	src/java/com/jskj/assets/server/entity/YimiaoyanshoutbExample.java
	src/java/com/jskj/assets/server/mapper/YimiaoyanshoutbMapper.xml
	web/WEB-INF/sql脚本/YMGL数据库.sql
barcode config
Merge origin/master

Conflicts:
	src/com/jskj/asset/client/bean/entity/Yimiaoyanshoutb.java
	src/com/jskj/asset/client/panel/ymgl/YiMiaoYanShouDanJDialog.java