From 9b784c99ed0f2926358cba1737bb346de5d492c7 Mon Sep 17 00:00:00 2001
From: qdxkrs <39894542+qdxkrs@users.noreply.github.com>
Date: Mon, 23 May 2022 14:36:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java   | 2 ++
 .../com/ruoyi/system/domain_yada/ThematicMapDomain.java     | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index 9639bc9c3..7ecbd0496 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -1,5 +1,6 @@
 package com.ruoyi;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -10,6 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * @author ruoyi
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@MapperScan("com.ruoyi.system.mapper_yada")
 public class RuoYiApplication
 {
     public static void main(String[] args)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
index 49908b895..39fc939e4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
@@ -85,32 +85,26 @@ public class ThematicMapDomain extends SysBaseEntity {
         this.picturePath = picturePath;
     }
 
-    @Override
     public String getRemarks() {
         return remarks;
     }
 
-    @Override
     public void setRemarks(String remarks) {
         this.remarks = remarks;
     }
 
-    @Override
     public String getCreatedBy() {
         return createdBy;
     }
 
-    @Override
     public void setCreatedBy(String createdBy) {
         this.createdBy = createdBy;
     }
 
-    @Override
     public LocalDateTime getCreatedTime() {
         return createdTime;
     }
 
-    @Override
     public void setCreatedTime(LocalDateTime createdTime) {
         this.createdTime = createdTime;
     }

From 15bc756bd4502b72b81a345e718d5964fdc811be Mon Sep 17 00:00:00 2001
From: qdxkrs <39894542+qdxkrs@users.noreply.github.com>
Date: Mon, 23 May 2022 14:38:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/domain_yada/ThematicMapDomain.java | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
index c9b54a0c4..39fc939e4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
@@ -89,41 +89,22 @@ public class ThematicMapDomain extends SysBaseEntity {
         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;
     }