diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java
index c250416..60f5222 100644
--- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java
+++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java
@@ -202,6 +202,13 @@ public class DeviceThread extends Thread {
                     } else {
                         scale = new XiShuiScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port"));
                     }
+                } else if (supermarket_id == 5) {
+                    // 2021-04-15 融嘉入口磅换了
+                    if (which.startsWith(Enums.CtrlFlowEnum.R.name())) {
+                        scale = new DingsongScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port"));
+                    } else {
+                        scale = new XiShuiScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port"));
+                    }
                 } else if (supermarket_id == 7) {
                     scale = new KeLiScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port"));
                 } else if (supermarket_id == 8 || supermarket_id == 9) {
@@ -311,7 +318,7 @@ public class DeviceThread extends Thread {
 
         try {
             return scale.weigh15();
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
 
             try {
diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
index 61ac2f5..4594582 100644
--- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
+++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
@@ -95,7 +95,7 @@ public class Config extends JFinalConfig {
     public static       DeviceThread    deviceThread   = new DeviceThread();
     public static       SocketIOService socketio       = null;
     private static      boolean         client_run     = true;
-    public static final String          CLINET_VERSION = "20210311";
+    public static final String          CLINET_VERSION = "20210415";
 
     public static String getRootPath() {
         return PathKit.getWebRootPath()