Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java

@@ -1,5 +1,9 @@
 package com.glxp.api.entity.basic;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
@@ -9,39 +13,162 @@ import java.util.Date;
  */
 
 @Data
+@TableName("basic_udirel")
 public class UdiRelevanceEntity {
 
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
+
+    /**
+     * 字典UUID
+     */
+    @TableField(value = "uuid")
     private String uuid;
+
+    /**
+     * 第三方主系统产品ID
+     */
+    @TableField(value = "mainId")
     private String mainId;
+
+    /**
+     * 第三方产品ID
+     */
+    @TableField(value = "thirdId")
     private String thirdId;
+
+    /**
+     * 第三方产品ID1
+     */
+    @TableField(value = "thirdId1")
     private String thirdId1;
+
+    /**
+     * 第三方产品ID2
+     */
+    @TableField(value = "thirdId2")
     private String thirdId2;
+
+    /**
+     * 第三方产品ID3
+     */
+    @TableField(value = "thirdId3")
     private String thirdId3;
+
+    /**
+     * 第三方产品ID4
+     */
+    @TableField(value = "thirdId4")
     private String thirdId4;
+
+    /**
+     * 阳光采购平台编码
+     */
+    @TableField(value = "udplatCode")
     private String udplatCode;
+
+    /**
+     * 是否以使用单元入库
+     */
+    @TableField(value = "isUseDy")
     private Boolean isUseDy;
+
+    /**
+     * 是否禁用
+     */
+    @TableField(value = "isDisable")
     private Boolean isDisable;
+
+    /**
+     * 是否锁定，锁定后不能再继续编辑
+     */
+    @TableField(value = "isLock")
     private Boolean isLock;
+
+    /**
+     * 1.未提交，2.已提交，3.已锁定
+     */
+    @TableField(value = "lockStatus")
     private Integer lockStatus;
+
+    /**
+     * 是否寄售（预入库)
+     */
+    @TableField(value = "isAdavence")
     private Boolean isAdavence;
+
+    /**
+     * 是否允许多次使用出库
+     */
+    @TableField(value = "useMuti")
     private Boolean useMuti;
+
+    /**
+     * 最小包装单元可使用次数
+     */
+    @TableField(value = "useNum")
     private Integer useNum;
+
+    /**
+     * 过滤供应商用
+     */
+    @TableField(value = "supName")
     private String supName;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
     private Date createTime;
+
+    @TableField(value = "overStockNum")
+    private Integer overStockNum;
+    @TableField(value = "recentDateTime")
+    private Integer recentDateTime;
+
+    @TableField(value = "lowStockNum")
+    private Integer lowStockNum;
+
+    @TableField(value = "relCode")
+    private String relCode;
+    /**
+     * 最後更新時間
+     */
+    @TableField(value = "updateTime")
     private Date updateTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(value = "modifyTime")
     private Date modifyTime;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "`createUser`")
     private String createUser;
-    private String updateUser;
-    private String remark;
-    private Integer lowStockNum;
-    private Integer overStockNum;
-    private Integer recentDateTime;
 
+    /**
+     * 更新人
+     */
+    @TableField(value = "updateUser")
+    private String updateUser;
 
+    @TableField(value = "remark")
+    private String remark;
+    @TableField(value = "useExpireTime")
     private Integer useExpireTime;
-    private boolean dispatch;           //是否可配送
+    @TableField(value = "dispatch")
-    private boolean groupBuy;           //是否集采产品
+    private boolean dispatch;
-    private String relCode;
+    @TableField(value = "groupBuy")        //是否可配送
+    private boolean groupBuy;
+    //是否集采产品
+    @TableField(value = "isDateBy")
     private Integer isDateBy;
-}
+    @TableField(value = "needCert")
+    private boolean needCert;           //是否需要资质材料
+
+    @TableField(value = "certIdFk")
+    private String certIdFk;
+}

src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java

@@ -9,6 +9,7 @@ public class BaseSyncResponse {
 
     private String taskId;
     private List<String> files;
+    private List<String> uploadFiles;
     private String updateTime;
 
 }