ok
Merge branch 'origin/master'

Conflicts:
	DATABASE/COMMON/PROCEDURE/Objects/GoodsKindWeighing/gpGet_Object_GoodsKindWeighing.sql