Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingGroupDetailServiceImpl.java

@@ -25,6 +25,7 @@ public class MesLoadingGroupDetailServiceImpl extends BaseMesService<MesLoadingG
     @Override
     protected void setPackQueryBean(MesLoadingGroupDetail bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getLoadingGroupNo(), "loadingGroupNo", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getShippingGroupCode(), "shippingGroupCode", packBean);
     }