Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/Wms/Wms.csproj
修改货位图表按钮的显示条件
Signed-off-by: zqloon <zqloon@gmail.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
合并要更改数据库（分拣线、罚没区等）库区的layer、col两个字段，不要让两个货位重合
Signed-off-by: zqloon <zqloon@gmail.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/Wms/Wms.csproj

Signed-off-by: zqb <940658539@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/THOK.WES/THOK.WES/THOK.WES/View/1/BaseTaskForm.Designer.cs
Signed-off-by: zqloon <zqloon@gmail.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
损益单 单位选择
Signed-off-by: zqb <940658539@qq.com>
修改数据结构精度调到4个小数位
Signed-off-by: zqb <940658539@qq.com>
Merge branch 'zqb/master'
Merge branch 'zql/master'

Conflicts:
	code/THOK.WES/THOK.WES/THOK.WES/View/1/BaseTaskForm.cs
表结构文档、执行Add-Migration命令之后的文件
Signed-off-by: zqb <940658539@qq.com>
Merge branch 'zqb/master'
Merge branch 'master' of git://github.com/zqloon/wms_rfid.git

Conflicts:
	code/THOK.WES/THOK.WES/THOK.WES/View/1/BaseTaskForm.cs
Merge branch 'zxl/master'