Merge origin/master

Conflicts:
	src/com/jskj/asset/client/bean/entity/Sale_detail_tb.java