Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java

@@ -1282,7 +1282,6 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
         jo.put("isOnline", isonline);
         jo.put("hasGoods", hasGoods);
         jo.put("message", message);
-        jo.put("hasGoods", hasGoods);
         return jo;
     }