Merge remote-tracking branch 'origin/uat-temp-nht-2504300000-46708' into uat-temp-nht-2504300000-46708

# Conflicts: # modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingKanbanCfgServiceImpl.java
3 months ago · 03c150420c
parent 36918bbbfc 762ed54cf7
commit 03c150420c
1 changed files with 1 additions and 0 deletions
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingKanbanCfgServiceImpl.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingKanbanCfgServiceImpl.java
@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.model.CustQtyByTimeChartDataModel;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesShippingKanbanCfgModel;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesShippingKanbanModel;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesShippingKanbanViewModel;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
 import cn.estsh.i3plus.mes.pcn.util.DateUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;