Merge remote-tracking branch 'origin/smf-core-21088' into smf-core-21088

src/main/resources/config/application.yml

@@ -33,7 +33,7 @@ lizhen:
     url: #http://172.30.88.19:8001/smf-core/api/Mes/machineCallMaterial
     url: #http://172.30.88.19:8001/smf-core/api/Mes/machineCallMaterial
   F3:
   F3:
     name: 3F
     name: 3F
-    line: C02-3FSMT-01,C02-3FSMT-03,C02-3FSMT-04,C02-3FSMT-08,C02-3FSMT-13,C02-3FSMT-14,C02-3FSMT-18,C03-1FSMT-01,C03-1FSMT-02,C03-1FSMT-11,C03-1FSMT-12
+    line: C03-1FSMT-01,C03-3FSMT-13,C02-3FSMT-12,C02-3FSMT-18,C02-3FSMT-19,C03-1FSMT-12,C02-3FSMT-02,C02-3FSMT-09,C02-3FSMT-11,C03-3FSMT-03,C03-1FSMT-11,C02-3FSMT-01,C03-1FSMT-02,C02-3FSMT-08,C02-3FSMT-06,C02-3FSMT-07,C02-3FSMT-17,C02-3FSMT-04,C02-3FSMT-14,C03-1FSMT-12,C02-3FSMT-05,C02-3FSMT-13,C02-3FSMT-03,C02-3FSMT-16,C03-1FSMT-02,C02-3FSMT-15
     url: http://10.68.27.85/smf-core/wcs/machineCallMaterial
     url: http://10.68.27.85/smf-core/wcs/machineCallMaterial
   F5:
   F5:
     name: #5F
     name: #5F