diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java index 7b38b41..df37099 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java @@ -6,8 +6,6 @@ import com.njcn.db.bo.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.time.LocalDateTime; - /** * * Description: @@ -48,12 +46,6 @@ public class CsEquipmentDeliveryPO extends BaseEntity { @TableField(value = "mac") private String mac; - /** - * 装置用途(治理、监测...) - */ -// @TableField(value = "dev_use") -// private String devUse; - /** * 装置类型(直连设备、网关设备、装置) */ @@ -78,42 +70,12 @@ public class CsEquipmentDeliveryPO extends BaseEntity { @TableField(value = "program_version") private String programVersion; - /** - * 调试人员 - */ - @TableField(value = "debug_person") - private String debugPerson; - - /** - * 出厂日期 - */ - @TableField(value = "producte_time") - private LocalDateTime producteTime; - - /** - * 检修日期 - */ - @TableField(value = "check_time") - private LocalDateTime checkTime; - - /** - * 调试日期 - */ - @TableField(value = "debug_time") - private LocalDateTime debugTime; - /** * 合同号 */ @TableField(value = "cntract_no") private String cntractNo; - /** - * 营销经理 - */ - @TableField(value = "sales_manager") - private String salesManager; - /** * 接入状态(1:未注册 2:注册 3:接入) */ @@ -144,4 +106,10 @@ public class CsEquipmentDeliveryPO extends BaseEntity { @TableField(value = "qr_path") private String qrPath; + /** + * 二维码文件路径 + */ + @TableField(value = "process") + private String process; + } \ No newline at end of file diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java index e9125ac..8aa5b24 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java @@ -4,6 +4,7 @@ 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 com.njcn.db.bo.BaseEntity; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,7 +21,7 @@ import java.time.LocalDateTime; @Data @NoArgsConstructor @TableName(value = "cs_event") -public class CsEventPO { +public class CsEventPO extends BaseEntity { /** * id */