Merge branch 'dep' into dep_nodyang

1 year ago · d1b58cc778
parent f815fe9bca 9c975c936b
commit d1b58cc778
1 changed files with 5 additions and 5 deletions
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/PlcAddressUtil.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/PlcAddressUtil.cs
@ -2,11 +2,11 @@
 {
    public class PlcAddressUtil
    {
-        // public static string IpAddress = "172.18.4.100";
-        // public static int Port = 102;
+        public static string IpAddress = "172.18.4.100";
+        public static int Port = 102;

        //测试的Plc
-        public static string IpAddress = "192.168.0.100";
-        public static int Port = 7788;
+        //public static string IpAddress = "192.168.0.100";
+        //public static int Port = 7788;
    }
 }