Merge origin/master

Conflicts:
	src/java/com/jskj/assets/server/dataGen/databaseGen.xml
	src/java/com/jskj/assets/server/entity/Yimiaobaosuntb.java
	src/java/com/jskj/assets/server/entity/YimiaobaosuntbExample.java
	src/java/com/jskj/assets/server/entity/baosuntb.java
	src/java/com/jskj/assets/server/entity/baosuntbExample.java
Merge origin/master

Conflicts:
	src/java/com/jskj/assets/server/dataGen/databaseGen.xml
	src/java/com/jskj/assets/server/entity/Yimiaobaosuntb.java
	src/java/com/jskj/assets/server/entity/YimiaobaosuntbExample.java
	src/java/com/jskj/assets/server/entity/baosuntb.java
	src/java/com/jskj/assets/server/entity/baosuntbExample.java
Merge origin/master