Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改冲突文件

Browse Source
This commit is contained in:
qdxkrs 2022-05-23 14:38:09 +08:00
parent c424d5cd89
commit 15bc756bd4
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
View File

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