Commit Graph

59 Commits

Author SHA1 Message Date
java_cuibaocheng@163.com
7417a7e4f6 Merge remote-tracking branch 'origin/upgrade' into upgrade
# Conflicts:
#	src/main/java/com/cm/population/controller/api/cult/CultController.java
#	src/main/java/com/cm/population/controller/api/residential/ResidentialController.java
#	src/main/java/com/cm/population/controller/route/house/HouseRouteController.java
#	src/main/java/com/cm/population/service/house/IHouseService.java
#	src/main/resources/mybatis/mapper/residential/residential-mapper.xml
#	src/main/resources/templates/building/save.html
#	src/main/resources/templates/building/update.html
#	src/main/resources/templates/house/list.html
#	src/main/resources/templates/house/save.html
#	src/main/resources/templates/house/update.html
#	src/main/resources/templates/rental/save.html
#	src/main/resources/templates/rental/update.html
2023-10-31 12:03:28 +08:00
java_cuibaocheng@163.com
304172e8c5 人口 2023-10-31 11:57:48 +08:00
Renpc-kilig
ea73a13afb 社区切换时,小区不切换bug修改 --renpc 2023-10-30 17:57:18 +08:00
Renpc-kilig
3b73d23372 以人找房、以房找人接口提交 --renpc 2023-10-27 17:56:35 +08:00
Renpc-kilig
9a268ce8e6 人房关系绑定 --renpc 2023-10-27 17:12:11 +08:00
Renpc-kilig
09699651e5 房屋功能代码提交 --renpc 2023-10-27 11:34:23 +08:00
java_cuibaocheng@163.com
19d3a88fa0 基础人口信息 2023-10-25 10:25:13 +08:00
425fb04628 删除版本信息 2021-06-29 13:55:28 +08:00
b20a70e804 first commit 2020-11-24 15:15:06 +08:00