Merge branch 'feature_zsrk' of https://github.com/wenyangw/lnyswz.git into feature_zsrk
Merge branch 'develop' into feature_zsrk
==
Merge branch 'develop' into feature_zsrk

Conflicts:
	resources/config.properties
==
==
Merge branch 'develop' into feature_zsrk
审批前更新记录信息
冲减销售提货前更新记录信息
==