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

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.aspect;
 
-import cn.estsh.i3plus.platform.common.tool.TimeTool;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -116,6 +116,6 @@ public class PcnRepositoryAspect {
 
     private void updateBeanSync(BaseBean bean) {
         bean.setSystemSyncStatus(CommonEnumUtil.FALSE);
-        bean.setSystemSyncDatetime("");
+        bean.setSystemSyncDatetime(MesPcnExtConstWords.EMPTY);
     }
 }