Merge remote-tracking branch 'origin/main'

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java

@@ -34,26 +34,26 @@ public class ContractFileEntity  {
     private Date creatortime;
 
     @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.UPDATE)
-    private String lastmodifyuserid;
+    private String lastModifyUserId;
 
     @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.UPDATE)
-    private String lastmodifyusername;
+    private String lastModifyUserName;
 
     @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.UPDATE)
-    private Date lastmodifytime;
+    private Date lastModifyTime;
 
     @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
-    private String deleteuserid;
+    private String deleteUserId;
 
     @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
-    private String deleteusername;
+    private String deleteUserName;
 
     @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
-    private Date deletetime;
+    private Date deleteTime;
 
     @TableLogic
     @TableField("DELETE_MARK")
-    private String deletemark;
+    private String deleteMark;
 
 
     @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/entity/VehicleEntity.java

@@ -31,26 +31,26 @@ public class VehicleEntity  {
     private Date creatortime;
 
     @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.UPDATE)
-    private String lastmodifyuserid;
+    private String lastModifyUserId;
 
     @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.UPDATE)
-    private String lastmodifyusername;
+    private String lastModifyUserName;
 
     @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.UPDATE)
-    private Date lastmodifytime;
+    private Date lastModifyTime;
 
     @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
-    private String deleteuserid;
+    private String deleteUserId;
 
     @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
-    private String deleteusername;
+    private String deleteUserName;
 
     @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
-    private Date deletetime;
+    private Date deleteTime;
 
     @TableField("DELETE_MARK")
     @TableLogic
-    private String deletemark;
+    private String deleteMark;
 
 
     @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)