Merge origin/master

Conflicts:
	src/com/jskj/asset/client/panel/ymgl/YiMiaoXiaFaJDialog.java
	src/com/jskj/asset/client/panel/ymgl/YiMiaoXiaoShouJDialog.java
Merge origin/master

Conflicts:
	src/java/com/jskj/assets/server/dataGen/databaseGen.xml
	src/java/com/jskj/assets/server/entity/Sale_detail_tb.java
	src/java/com/jskj/assets/server/entity/Sale_detail_tbExample.java
	src/java/com/jskj/assets/server/mapper/Sale_detail_tbMapper.java
	src/java/com/jskj/assets/server/mapper/Sale_detail_tbMapper.xml
	src/java/com/jskj/assets/server/mapper/SaletbMapper.xml
	src/java/com/jskj/assets/server/servcie/Yimiaoshenqingdan/YimiaoshenqingdanService.java