Merge remote-tracking branch 'origin/master' into master

imcs-ui/src/lang/zh/resource.js

@@ -137,7 +137,6 @@ export default {
 				zoneName: '所属产线',
 				model: '型号',
 				category: '设备分类',
-				zoneName: '所属产线',
         		programSynTime: '同步时间',
         		programNum: '程序数量',
 				nums: '工作位置数量',