Merge branch 'dev' into test

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java

@@ -54,7 +54,7 @@ public class AndonHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCellCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCenterCode(), "workCenterCode", result);
         DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCellCode(), "workCellCode", result);
         DdlPreparedPack.getStringEqualPack(andonPLC.getNodeIP(), "nodeIP", result);
         DdlPreparedPack.getStringEqualPack(andonPLC.getChannelName(), "channelName", result);
@@ -62,6 +62,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonPLC.getTagAddress(), "tagAddress", result);
         DdlPreparedPack.getStringEqualPack(andonPLC.getTagType(), "tagType", result);
         DdlPreparedPack.getStringEqualPack(andonPLC.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonPLC.getGroupNo(), "groupNo", result);
 
         getStringBuilderPack(andonPLC, result);
         return result;