Merge remote-tracking branch 'origin/master'

master
jiyufei 3 months ago
commit 8304102d49

@ -43,27 +43,27 @@ public class YysMaterialRequirementItemEntity {
private BigDecimal notIntoNumber; private BigDecimal notIntoNumber;
@TableField(value = "LACK_NUMBER" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "LACK_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal lackNumber; private BigDecimal lackNumber;
@TableField("F_CREATOR_TIME") @TableField(value = "F_CREATOR_TIME" , fill = FieldFill.INSERT)
private Date creatorTime; private Date creatorTime;
@TableField("F_CREATOR_USER_ID") @TableField(value = "F_CREATOR_USER_ID" , fill = FieldFill.INSERT)
private String creatorUserId; private String creatorUserId;
@TableField("F_LAST_MODIFY_TIME") @TableField(value = "F_LAST_MODIFY_TIME" , fill = FieldFill.INSERT_UPDATE)
private Date lastModifyTime; private Date lastModifyTime;
@TableField("F_LAST_MODIFY_USER_ID") @TableField(value = "F_LAST_MODIFY_USER_ID" , fill = FieldFill.INSERT_UPDATE)
private String lastModifyUserId; private String lastModifyUserId;
@TableField("F_DELETE_TIME") @TableField(value = "F_DELETE_TIME" , fill = FieldFill.UPDATE)
private Date deleteTime; private Date deleteTime;
@TableField("F_DELETE_USER_ID") @TableField(value = "F_DELETE_USER_ID" , fill = FieldFill.UPDATE)
private String deleteUserId; private String deleteUserId;
@TableField("F_DELETE_MARK") @TableField(value = "F_DELETE_MARK" , updateStrategy = FieldStrategy.IGNORED)
private Integer deleteMark; private Integer deleteMark;
@TableField("F_TENANT_ID") @TableField("F_TENANT_ID")
private String tenantId; private String tenantId;
@TableField("COMPANY_ID") @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
private String companyId; private String companyId;
@TableField("DEPARTMENT_ID") @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
private String departmentId; private String departmentId;
@TableField("ORGANIZE_JSON_ID") @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
private String organizeJsonId; private String organizeJsonId;
@TableField("F_FLOW_ID") @TableField("F_FLOW_ID")
private String flowId; private String flowId;

@ -26,27 +26,27 @@ public class YysMaterialRequirementPlanEntity {
private String isCreatePlan; private String isCreatePlan;
@TableField(value = "REAMRK" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "REAMRK" , updateStrategy = FieldStrategy.IGNORED)
private String reamrk; private String reamrk;
@TableField("F_CREATOR_TIME") @TableField(value = "F_CREATOR_TIME" , fill = FieldFill.INSERT)
private Date creatorTime; private Date creatorTime;
@TableField("F_CREATOR_USER_ID") @TableField(value = "F_CREATOR_USER_ID" , fill = FieldFill.INSERT)
private String creatorUserId; private String creatorUserId;
@TableField("F_LAST_MODIFY_TIME") @TableField(value = "F_LAST_MODIFY_TIME" , fill = FieldFill.INSERT_UPDATE)
private Date lastModifyTime; private Date lastModifyTime;
@TableField("F_LAST_MODIFY_USER_ID") @TableField(value = "F_LAST_MODIFY_USER_ID" , fill = FieldFill.INSERT_UPDATE)
private String lastModifyUserId; private String lastModifyUserId;
@TableField("F_DELETE_TIME") @TableField(value = "F_DELETE_TIME" , fill = FieldFill.UPDATE)
private Date deleteTime; private Date deleteTime;
@TableField("F_DELETE_USER_ID") @TableField(value = "F_DELETE_USER_ID" , fill = FieldFill.UPDATE)
private String deleteUserId; private String deleteUserId;
@TableField("F_DELETE_MARK") @TableField(value = "F_DELETE_MARK" , updateStrategy = FieldStrategy.IGNORED)
private Integer deleteMark; private Integer deleteMark;
@TableField("F_TENANT_ID") @TableField("F_TENANT_ID")
private String tenantId; private String tenantId;
@TableField("COMPANY_ID") @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
private String companyId; private String companyId;
@TableField("DEPARTMENT_ID") @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
private String departmentId; private String departmentId;
@TableField("ORGANIZE_JSON_ID") @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
private String organizeJsonId; private String organizeJsonId;
@TableField("F_FLOW_ID") @TableField("F_FLOW_ID")
private String flowId; private String flowId;

Loading…
Cancel
Save