Merge branch 'master' of git@github.com:zyylonghai/HNXC_WMS.git
报表赋值
Merge branch 'master' of git@github.com:shjstudy/HNXC_WMS.git
Merge branch 'master' of git@github.com:XMTHOK/HNXC_WMS.git

Conflicts:
	WMS/Controllers/Wms/WMS/StockInWorkController.cs