0103提交
Merge origin/master

Conflicts:
	src/java/com/jskj/assets/server/entity/Danjuleixingtb.java
	src/java/com/jskj/assets/server/entity/DanjuleixingtbExample.java
	src/java/com/jskj/assets/server/entity/YiMiaotb.java
	src/java/com/jskj/assets/server/entity/YiMiaotbExample.java
	src/java/com/jskj/assets/server/entity/Yimiaodengjitb.java
	src/java/com/jskj/assets/server/entity/YimiaodengjitbExample.java
	src/java/com/jskj/assets/server/mapper/DanjuleixingtbMapper.java
	src/java/com/jskj/assets/server/mapper/DanjuleixingtbMapper.xml
	src/java/com/jskj/assets/server/mapper/YiMiaotbMapper.java
	src/java/com/jskj/assets/server/mapper/YiMiaotbMapper.xml
	src/java/com/jskj/assets/server/mapper/YimiaodengjitbMapper.xml