diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml b/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml index ab5b2ba..dc64083 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml @@ -74,7 +74,7 @@ spring: host: 127.0.0.1 port: 6379 # password: qweasd,.123 # 密码为空时，请将本行注释 - password: 123456 # 密码为空时，请将本行注释 +# password: 123456 # 密码为空时，请将本行注释 timeout: 3000 #超时时间(单位：秒) lettuce: #Lettuce为Redis的Java驱动包 pool: diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClientEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClientEntity.java index 9703129..6ea2945 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClientEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClientEntity.java @@ -55,10 +55,27 @@ public class ClientEntity { private String lastLogIp; @TableField(value = "ENABLED_MARK" , updateStrategy = FieldStrategy.IGNORED) private Integer enabledMark; - @TableField("CREATOR_USER_ID") - private String creatorUserId; - @TableField(value = "CREATOR_TIME" , updateStrategy = FieldStrategy.IGNORED) - private Date creatorTime; +// @TableField("CREATOR_USER_ID") +// private String creatorUserId; +// @TableField(value = "CREATOR_TIME" , updateStrategy = FieldStrategy.IGNORED) +// private Date creatorTime; @TableField("TENANT_ID") private String tenantId; + + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) + private Date creatorTime; + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) + private String creatorUserId; + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) + private Date deleteTime; + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) + private String deleteUserId; + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; +// @TableField("F_TENANT_ID") +// private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnterpriseAccountBillEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnterpriseAccountBillEntity.java index b39dbfa..7f1f73d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnterpriseAccountBillEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnterpriseAccountBillEntity.java @@ -35,12 +35,29 @@ public class EnterpriseAccountBillEntity { private BigDecimal payoutAmount; @TableField(value = "ACCOUNT_BALANCE" , updateStrategy = FieldStrategy.IGNORED) private BigDecimal accountBalance; - @TableField(value = "CREATOR_USER_ID" , updateStrategy = FieldStrategy.IGNORED) - private String creatorUserId; - @TableField(value = "CREATOR_TIME" , updateStrategy = FieldStrategy.IGNORED) - private Date creatorTime; +// @TableField(value = "CREATOR_USER_ID" , updateStrategy = FieldStrategy.IGNORED) +// private String creatorUserId; +// @TableField(value = "CREATOR_TIME" , updateStrategy = FieldStrategy.IGNORED) +// private Date creatorTime; @TableField(value = "REMARK" , updateStrategy = FieldStrategy.IGNORED) private String remark; @TableField("F_FLOW_ID") private String flowId; + + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) + private Date creatorTime; + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) + private String creatorUserId; + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) + private Date deleteTime; + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) + private String deleteUserId; + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + @TableField("F_TENANT_ID") + private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnterpriseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnterpriseEntity.java index 67f8c47..37a9e81 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnterpriseEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnterpriseEntity.java @@ -69,14 +69,14 @@ public class EnterpriseEntity { private BigDecimal accountBalance; @TableField(value = "DESCRIPTION" , updateStrategy = FieldStrategy.IGNORED) private String description; - @TableField("CREATOR_TIME") - private Date creatorTime; - @TableField("CREATOR_USER_ID") - private String creatorUserId; - @TableField("LAST_MODIFY_TIME") - private Date lastModifyTime; - @TableField("LAST_MODIFY_USER_ID") - private String lastModifyUserId; +// @TableField("CREATOR_TIME") +// private Date creatorTime; +// @TableField("CREATOR_USER_ID") +// private String creatorUserId; +// @TableField("LAST_MODIFY_TIME") +// private Date lastModifyTime; +// @TableField("LAST_MODIFY_USER_ID") +// private String lastModifyUserId; @TableField("FIRST_LOG_TIME") private Date firstLogTime; @TableField("FIRST_LOG_IP") @@ -95,8 +95,25 @@ public class EnterpriseEntity { private Integer logErrorCount; @TableField("CHANGE_PASSWORD_DATE") private Date changePasswordDate; - @TableField("TENANT_ID") - private String tenantId; +// @TableField("TENANT_ID") +// private String tenantId; @TableField("F_FLOW_ID") private String flowId; + + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) + private Date creatorTime; + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) + private String creatorUserId; + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) + private Date deleteTime; + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) + private String deleteUserId; + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + @TableField("F_TENANT_ID") + private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnterpriserecyclestationEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnterpriserecyclestationEntity.java index 045493f..42f3f4a 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnterpriserecyclestationEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnterpriserecyclestationEntity.java @@ -66,16 +66,33 @@ public class EnterpriserecyclestationEntity { private Integer acceptRange; @TableField("ACCEPT_HOUSING_ESTATE") private String acceptHousingEstate; - @TableField("CREATOR_TIME") +// @TableField("CREATOR_TIME") +// private Date creatorTime; +// @TableField("CREATOR_USER_ID") +// private String creatorUserId; +// @TableField("LAST_MODIFY_TIME") +// private Date lastModifyTime; +// @TableField("LAST_MODIFY_USER_ID") +// private String lastModifyUserId; +// @TableField("TENANT_ID") +// private String tenantId; + @TableField("F_FLOW_ID") + private String flowId; + + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("TENANT_ID") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) + private Date deleteTime; + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) + private String deleteUserId; + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + @TableField("F_TENANT_ID") private String tenantId; - @TableField("F_FLOW_ID") - private String flowId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/HousingEstateEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/HousingEstateEntity.java index b0cde01..9a9d9e2 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/HousingEstateEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/HousingEstateEntity.java @@ -38,12 +38,29 @@ public class HousingEstateEntity { private Integer sourceType; @TableField(value = "ENABLED_MARK" , updateStrategy = FieldStrategy.IGNORED) private Integer enabledMark; - @TableField("CREATOR_USER_ID") - private String creatorUserId; - @TableField("CREATOR_TIME") - private Date creatorTime; +// @TableField("CREATOR_USER_ID") +// private String creatorUserId; +// @TableField("CREATOR_TIME") +// private Date creatorTime; @TableField("REMARK") private String remark; @TableField("F_FLOW_ID") private String flowId; + + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) + private Date creatorTime; + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) + private String creatorUserId; + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) + private Date deleteTime; + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) + private String deleteUserId; + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + @TableField("F_TENANT_ID") + private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleOrderEntity.java index 1fb1728..c33f2b1 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleOrderEntity.java @@ -37,10 +37,10 @@ public class RecycleOrderEntity { private String clientName; @TableField(value = "CLIENT_MOBILE" , updateStrategy = FieldStrategy.IGNORED) private String clientMobile; - @TableField(value = "CREATOR_USER_ID" , updateStrategy = FieldStrategy.IGNORED) - private String creatorUserId; - @TableField(value = "CREATOR_TIME" , updateStrategy = FieldStrategy.IGNORED) - private Date creatorTime; +// @TableField(value = "CREATOR_USER_ID" , updateStrategy = FieldStrategy.IGNORED) +// private String creatorUserId; +// @TableField(value = "CREATOR_TIME" , updateStrategy = FieldStrategy.IGNORED) +// private Date creatorTime; @TableField(value = "RECYCLE_ADDRESS" , updateStrategy = FieldStrategy.IGNORED) private String recycleAddress; @TableField(value = "APPOINTMENT_TIME_START" , updateStrategy = FieldStrategy.IGNORED) @@ -87,4 +87,21 @@ public class RecycleOrderEntity { private String undefined4; @TableField("F_FLOW_ID") private String flowId; + + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) + private Date creatorTime; + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) + private String creatorUserId; + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) + private Date deleteTime; + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) + private String deleteUserId; + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + @TableField("F_TENANT_ID") + private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleStationStaffEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleStationStaffEntity.java index 8195a06..2a65c30 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleStationStaffEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleStationStaffEntity.java @@ -53,11 +53,28 @@ public class RecycleStationStaffEntity { private String creatorUserId; @TableField("CREATOR_TIME") private Date creatorTime; - @TableField("TENANT_ID") - private String tenantId; +// @TableField("TENANT_ID") +// private String tenantId; @TableField("F_FLOW_ID") private String flowId; @TableField("openid") private String openid; + +// @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) +// private Date creatorTime; +// @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) +// private String creatorUserId; + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) + private Date deleteTime; + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) + private String deleteUserId; + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + @TableField("F_TENANT_ID") + private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecyclestationhousingestateEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecyclestationhousingestateEntity.java index 8c2a700..ea0c514 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecyclestationhousingestateEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecyclestationhousingestateEntity.java @@ -26,8 +26,25 @@ public class RecyclestationhousingestateEntity { private String housingEstateName; @TableField("DISTANCE") private Double distance; - @TableField("CREATOR_TIME") +// @TableField("CREATOR_TIME") +// private Date creatorTime; +// @TableField("CREATOR_USER_ID") +// private String creatorUserId; + + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) + private Date deleteTime; + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) + private String deleteUserId; + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + @TableField("F_TENANT_ID") + private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecyclestationpriceEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecyclestationpriceEntity.java index 9d3f607..10bbc92 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecyclestationpriceEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecyclestationpriceEntity.java @@ -25,8 +25,25 @@ public class RecyclestationpriceEntity { private String recycleTypeName; @TableField(value = "UNIT_PRICE" , updateStrategy = FieldStrategy.IGNORED) private BigDecimal unitPrice; - @TableField("CREATOR_TIME") +// @TableField("CREATOR_TIME") +// private Date creatorTime; +// @TableField("CREATOR_USER_ID") +// private String creatorUserId; + + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) + private Date deleteTime; + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) + private String deleteUserId; + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + @TableField("F_TENANT_ID") + private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectBasicEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectBasicEntity.java index b58546b..d74df09 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectBasicEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectBasicEntity.java @@ -216,22 +216,38 @@ public class SubjectBasicEntity { private Integer enabledMark; @TableField("F_SORT_CODE") private Long sortCode; - @TableField("F_CREATOR_TIME") +// @TableField("F_CREATOR_TIME") +// private Date creatorTime; +// @TableField("F_CREATOR_USER_ID") +// private String creatorUserId; +// @TableField("F_LAST_MODIFY_TIME") +// private Date lastModifyTime; +// @TableField("F_LAST_MODIFY_USER_ID") +// private String lastModifyUserId; +// @TableField("F_DELETE_TIME") +// private Date deleteTime; +// @TableField("F_DELETE_USER_ID") +// private String deleteUserId; +// @TableField("F_DELETE_MARK") +// private Integer deleteMark; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField("F_FLOW_ID") + private String flowId; + + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("F_FLOW_ID") - private String flowId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectContactsEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectContactsEntity.java index 00c8393..2cb3a98 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectContactsEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectContactsEntity.java @@ -50,19 +50,36 @@ public class SubjectContactsEntity { private Integer enabledMark; @TableField("F_SORT_CODE") private Long sortCode; - @TableField("F_CREATOR_TIME") +// @TableField("F_CREATOR_TIME") +// private Date creatorTime; +// @TableField("F_CREATOR_USER_ID") +// private String creatorUserId; +// @TableField("F_LAST_MODIFY_TIME") +// private Date lastModifyTime; +// @TableField("F_LAST_MODIFY_USER_ID") +// private String lastModifyUserId; +// @TableField("F_DELETE_TIME") +// private Date deleteTime; +// @TableField("F_DELETE_USER_ID") +// private String deleteUserId; +// @TableField("F_DELETE_MARK") +// private Integer deleteMark; +// @TableField("F_TENANT_ID") +// private String tenantId; + + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; @TableField("F_TENANT_ID") private String tenantId; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/UserBindEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/UserBindEntity.java index bdfa4f4..4fb8eee 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/UserBindEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/UserBindEntity.java @@ -24,10 +24,27 @@ public class UserBindEntity { private String openId; @TableField(value = "USER_TYPE" , updateStrategy = FieldStrategy.IGNORED) private Integer userType; - @TableField(value = "CREATOR_USER_ID" , updateStrategy = FieldStrategy.IGNORED) - private String creatorUserId; - @TableField(value = "CREATOR_TIME" , updateStrategy = FieldStrategy.IGNORED) +// @TableField(value = "CREATOR_USER_ID" , updateStrategy = FieldStrategy.IGNORED) +// private String creatorUserId; +// @TableField(value = "CREATOR_TIME" , updateStrategy = FieldStrategy.IGNORED) +// private Date creatorTime; +// @TableField("TENANT_ID") +// private String tenantId; + + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("TENANT_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) + private String creatorUserId; + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) + private Date deleteTime; + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) + private String deleteUserId; + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-portal/jnpf-visualdev-portal-entity/pom.xml b/jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-portal/jnpf-visualdev-portal-entity/pom.xml index 65ea0eb..917e962 100644 --- a/jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-portal/jnpf-visualdev-portal-entity/pom.xml +++ b/jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-portal/jnpf-visualdev-portal-entity/pom.xml @@ -17,6 +17,10 @@ jnpf-common-all ${project.version} + + org.projectlombok + lombok + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/package.json b/jnpf-java-boot/jnpf-web/package.json index 223e5fc..7c8851c 100644 --- a/jnpf-java-boot/jnpf-web/package.json +++ b/jnpf-java-boot/jnpf-web/package.json @@ -126,4 +126,4 @@ "> 1%", "last 2 versions" ] -} \ No newline at end of file +}