Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

zgq

2021-03-24 67f63831f75368fa83f3687f8b3d45ea0eb55394

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -11,10 +11,10 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>03/24/2021 10:00:01</publishTime>
      <publishTime>03/24/2021 14:06:39</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>03/24/2021 10:00:01</publishTime>
      <publishTime>03/24/2021 14:06:39</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -932,7 +932,7 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/index.html">
      <publishTime>03/24/2021 10:00:35</publishTime>
      <publishTime>03/24/2021 14:01:04</publishTime>
    </File>
    <File Include="views/senior/echarts/bar.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -1084,6 +1084,12 @@
    <File Include="views/基础资料/公用基础资料/Gy_Warehouse.html">
      <publishTime>03/24/2021 09:17:43</publishTime>
    </File>
    <File Include="views/基础资料/工资基础资料/Gy_Group.html">
      <publishTime>03/24/2021 14:06:30</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_BadReason.html">
      <publishTime>03/24/2021 10:54:34</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_Process.html">
      <publishTime>03/23/2021 16:28:14</publishTime>
    </File>
@@ -1099,6 +1105,9 @@
    <File Include="views/基础资料/采购基础资料/Gy_Supplier.html">
      <publishTime>03/24/2021 09:59:52</publishTime>
    </File>
    <File Include="views/基础资料/销售基础资料/Gy_Customer.html">
      <publishTime>03/24/2021 10:29:28</publishTime>
    </File>
    <File Include="views/生产管理/生产任务单/Sc_ICMOBillList.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>