Merge branch 'master' of http://gitlab.fangjia.com/dev0/main into open_gj

# Conflicts:
#	projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java
This commit is contained in:
2021-11-15 19:08:41 +08:00
60 changed files with 4473 additions and 328 deletions
@@ -234,6 +234,8 @@ public class District implements SeaweedEntity {
private String mainTypeArea;
private String createYear;
private Integer nameCat;
@Column(name = "source_web")
public String getSourceWeb() {
@@ -1879,9 +1881,13 @@ public class District implements SeaweedEntity {
public void setTownship(String township) {
this.township = township;
}
@Column(name = "name_cat")
public Integer getNameCat() {
return nameCat;
}
public void setNameCat(Integer nameCat) {
this.nameCat = nameCat;
}
}