解决冲突

2023-02-21 18:36:28 +08:00 · 2023-02-21 18:36:28 +08:00 · 6988ccc274
commit 6988ccc274
parent 96adb93d4c
1 changed files with 0 additions and 6 deletions
--- a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java
@ -220,12 +220,6 @@ public class Project implements Serializable {
    private java.lang.String placeCode;
    /**
     * 坐标组
     */
    @Excel(name = "坐标组", width = 15)
    @ApiModelProperty(value = "坐标组")
    private java.lang.String coordinateGroup;
    /**
     * 坐标组
     */