Merge branch '沃森川job同步飞书' into 飞书小程序

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -23,10 +23,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     public static String YYYYMMDD_SECOND = "yyyy/MM/dd";
     public static String YYYY_MM_DD_SECOND = "yyyy/MM/dd HH:mm";
     public static String YYYY_MM_DD_HH_MM_SS_SECOND = "yyyy/MM/dd HH:mm:ss";
-    public static String YYYY_MM_DD_HH_MM_SS_THIRD = "yyyy/M/dd HH:mm:ss";
+    public static String YYYY_MM_DD_HH_MM_SS_THIRD = "yyyy/M/dd H:mm:ss";
     public static String YYYY_MM_DD_HH_MM_SS_FOUR = "yyyy/M/d H:mm:ss";
     public static String YYYYMM = "yyyyMM";
     public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+    public static String YYYY_M_D_H_M_S = "yyyy/M/dd H:m:s";
 
     public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
     public static String YYYY_MM_DD_HH_MM = "yyyy-MM-dd HH:mm";

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/ManufactureOrderSyncJob.java

@@ -50,7 +50,7 @@ public class ManufactureOrderSyncJob extends SyncAccountsJobAbstract {
         return Arrays.asList(
                 "code",
                 "manufactureorderdetails_inventory_code",
-                "memo");
+                "ManufactureOrderDetails_pubuserdefnvc2");
     }
 
     @Override
@@ -79,7 +79,7 @@ public class ManufactureOrderSyncJob extends SyncAccountsJobAbstract {
         map.put("VoucherDate", new CJTSyncTypeRelation("单据日期",TableFieldTypeEnum.DATE, DateUtils.YYYYMMDD_SECOND));
         map.put("manufactureorderdetails_sourcevouchercode", new CJTSyncTypeRelation("来源单号"));
         map.put("Code", new CJTSyncTypeRelation("单据编码"));
-        map.put("CreatedTime", new CJTSyncTypeRelation("创建时间",TableFieldTypeEnum.DATE, DateUtils.YYYY_MM_DD_HH_MM_SS_THIRD));
+        map.put("CreatedTime", new CJTSyncTypeRelation("创建时间",TableFieldTypeEnum.DATE, DateUtils.YYYY_M_D_H_M_S));
         map.put("Department_Name", new CJTSyncTypeRelation("生产车间"));
         map.put("person_name", new CJTSyncTypeRelation("负责人"));
         map.put("ManufactureOrderDetails_Inventory_Code", new CJTSyncTypeRelation("产品编码"));