解决冲突
This commit is contained in:
parent
96adb93d4c
commit
6988ccc274
@ -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;
|
||||
/**
|
||||
* 坐标组
|
||||
*/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user