合并更新

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java

@@ -15,61 +15,67 @@ public class SysBaseEntity implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 创建者 */
-    private String createdBy;
+    private String createBy;
 
     /** 创建时间 */
-    private LocalDateTime createdTime;
+    private LocalDateTime createTime;
 
     /** 更新者 */
-    private String updatedBy;
+    private String updateBy;
 
     /** 更新时间 */
-    private LocalDateTime updatedTime;
+    private LocalDateTime updateTime;
 
     /** 备注 */
-    private String remarks;
+    private String remark;
 
     /** 请求参数 */
     private Map<String, Object> params;
 
-    public String getCreatedBy() {
-        return createdBy;
+    public String getCreateBy()
+    {
+        return createBy;
     }
 
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
+    public void setCreateBy(String createBy)
+    {
+        this.createBy = createBy;
     }
 
-    public LocalDateTime getCreatedTime() {
-        return createdTime;
+    public LocalDateTime getCreateTime() {
+        return createTime;
     }
 
-    public void setCreatedTime(LocalDateTime createdTime) {
-        this.createdTime = createdTime;
+    public void setCreateTime(LocalDateTime createTime) {
+        this.createTime = createTime;
     }
 
-    public String getUpdatedBy() {
-        return updatedBy;
+    public String getUpdateBy()
+    {
+        return updateBy;
     }
 
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
+    public void setUpdateBy(String updateBy)
+    {
+        this.updateBy = updateBy;
     }
 
-    public LocalDateTime getUpdatedTime() {
-        return updatedTime;
+    public LocalDateTime getUpdateTime() {
+        return updateTime;
     }
 
-    public void setUpdatedTime(LocalDateTime updatedTime) {
-        this.updatedTime = updatedTime;
+    public void setUpdateTime(LocalDateTime updateTime) {
+        this.updateTime = updateTime;
     }
 
-    public String getRemarks() {
-        return remarks;
+    public String getRemark()
+    {
+        return remark;
     }
 
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
     }
 
     public Map<String, Object> getParams()