Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev

# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java

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

@@ -85,32 +85,45 @@ public class ThematicMapDomain extends SysBaseEntity {
         this.picturePath = picturePath;
     }
 
-
     public String getRemarks() {
         return remarks;
     }
 
+<<<<<<< HEAD
+=======
 
+>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
     public void setRemarks(String remarks) {
         this.remarks = remarks;
     }
 
+<<<<<<< HEAD
+=======
 
+>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
     public String getCreatedBy() {
         return createdBy;
     }
 
+<<<<<<< HEAD
 
+>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
     public void setCreatedBy(String createdBy) {
         this.createdBy = createdBy;
     }
 
+<<<<<<< HEAD
+=======
 
+>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
     public LocalDateTime getCreatedTime() {
         return createdTime;
     }
 
+<<<<<<< HEAD
+=======
 
+>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
     public void setCreatedTime(LocalDateTime createdTime) {
         this.createdTime = createdTime;
     }