Merge origin/master

Conflicts:
	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/entity/Saletb.java
	src/java/com/jskj/assets/server/entity/SaletbExample.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
Merge origin/master

Conflicts:
	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/entity/Saletb.java
	src/java/com/jskj/assets/server/entity/SaletbExample.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
Merge origin/master
Merge origin/master

Conflicts:
	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/entity/Saletb.java
	src/java/com/jskj/assets/server/entity/SaletbExample.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
Merge origin/master