Block a user
9be57ad750
Merge pull request 'test' (#47) from test into master
f7313c5911
Merge pull request 'lb' (#46) from lb into test
a7e81ad8fb
Merge branch 'test' into lb
32cbf9076f
update 更新设备类型上传
9a411cc663
Merge pull request 'dy' (#45) from dy into test
ff9e93d264
Merge pull request 'dy' (#28) from dy into test
ee0affc78f
Merge branch 'test' into dy
dfec94be17
表格
159d626b30
Merge pull request 'dy' (#25) from dy into test
bc5d3d44d5
页面
e9538744c3
冲突
8cf2f9f7e9
生产监控
5a3e16df1b
Merge pull request 'fzq' (#32) from fzq into develop
6815ac4cc4
'修改设备与PLC关联-新增-下拉框条数'
4ffbdaef8a
'设备与PLC,设备获取所有'
d1c93cbf46
Merge pull request 'zhp' (#21) from zhp into test
7d959e8ad3
Merge branch 'test' into zhp
6f0040a0ae
生产监控更新