Commit Graph

323 Commits

Author SHA1 Message Date
TS-QD1
c4d0276cc1 增加网格绘制管理 2023-11-07 15:52:54 +08:00
TS-QD1
40b6feb255 Merge remote-tracking branch 'origin/upgrade' into upgrade 2023-11-06 18:22:36 +08:00
Renpc-kilig
aca7bd83c2 新增查看自己创建的数据列表 --renpc 2023-11-06 17:12:54 +08:00
TS-QD1
1ebce7bef9 Merge remote-tracking branch 'origin/upgrade' into upgrade 2023-11-06 14:11:05 +08:00
java_cuibaocheng@163.com
40de40fae9 增加网格员菜单权限限制页面 2023-11-06 11:58:00 +08:00
TS-QD1
b6bb806643 Merge remote-tracking branch 'origin/upgrade' into upgrade 2023-11-04 17:58:12 +08:00
java_cuibaocheng@163.com
d607204d81 修改新增人员设置 2023-11-04 17:46:19 +08:00
TS-QD1
62872782f2 Merge remote-tracking branch 'origin/upgrade' into upgrade 2023-11-04 16:24:39 +08:00
java_cuibaocheng@163.com
3525027e79 修改新增人员设置 2023-11-04 16:24:00 +08:00
TS-QD1
78a039d21a Merge remote-tracking branch 'origin/upgrade' into upgrade 2023-11-04 16:14:14 +08:00
java_cuibaocheng@163.com
56cfc9f68e 修改证件号校验 , 人口录入页面布局 , 年龄解析 2023-11-04 15:56:40 +08:00
TS-QD1
e28f74d893 Merge remote-tracking branch 'origin/upgrade' into upgrade 2023-11-04 15:48:43 +08:00
java_cuibaocheng@163.com
9d24b9e6ce 修改证件号校验 , 人口录入页面布局 , 年龄解析 2023-11-04 15:48:05 +08:00
TS-QD1
974e637851 修改样式 2023-11-04 15:40:06 +08:00
java_cuibaocheng@163.com
38af70dc8b 修改证件号校验 , 人口录入页面布局 , 年龄解析 2023-11-04 15:37:24 +08:00
java_cuibaocheng@163.com
e528a85aa9 修改证件号校验 , 人口录入页面布局 , 年龄解析 2023-11-04 15:26:01 +08:00
java_cuibaocheng@163.com
77e5fff71d 修改证件号校验 , 人口录入页面布局 , 年龄解析 2023-11-04 15:07:48 +08:00
TS-QD1
db5be7b815 新增接口,修改问题 2023-11-04 14:13:17 +08:00
java_cuibaocheng@163.com
bcdc7cbfab 修改页面Ztree的布局 2023-11-03 17:41:23 +08:00
Renpc-kilig
e01f67354c 以人找房、以房找人Vue版本、bug修改 --renpc 2023-11-03 11:02:12 +08:00
Renpc-kilig
803c831369 以人找房、以房找人Vue版本 --renpc 2023-11-02 18:33:01 +08:00
java_cuibaocheng@163.com
e49472666f 人口新增基础查询接口 - cbc 2023-11-02 17:56:25 +08:00
Renpc-kilig
439a7380ef 以房找人逻辑修改
bug修改--renpc
2023-11-02 16:59:43 +08:00
java_cuibaocheng@163.com
67b4824834 人口新增基础查询接口 - cbc 2023-11-02 16:42:12 +08:00
java_cuibaocheng@163.com
e528ac4251 人口新增基础查询接口 - cbc 2023-11-02 16:18:15 +08:00
java_cuibaocheng@163.com
dc79f25cf8 人口新增基础查询接口 - cbc 2023-11-02 16:07:57 +08:00
Renpc-kilig
22871eff0f 设置接口调用权限
修改新增/修改页面弹出方式
修改地图打开方式
bug修改--renpc
2023-11-02 15:40:18 +08:00
java_cuibaocheng@163.com
2174d56cd9 人口新增基础查询接口 - cbc 2023-11-01 17:28:15 +08:00
Renpc-kilig
0c4b5334e6 社区、街道名称保存到数据库 --renpc 2023-11-01 09:54:20 +08:00
Renpc-kilig
1a20030179 config配置文件提交 --renpc 2023-10-31 12:23:27 +08:00
java_cuibaocheng@163.com
3fa041bf25 人口新提交2023年10月31日12时 2023-10-31 12:20:45 +08:00
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
ad92b12d94 配置文件提交 --renpc 2023-10-31 11:49:56 +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
TSKJ_PC1
420ddc5c90
删除 .idea 2023-10-27 11:18:23 +08:00
TSKJ_PC1
b90dbe7564
删除 classes 2023-10-27 10:33:25 +08:00
java_cuibaocheng@163.com
6de80ef25d 人口 2023-10-25 11:00:07 +08:00
java_cuibaocheng@163.com
b703dbd68b 删除static下的文件 2023-10-25 10:27:26 +08:00
java_cuibaocheng@163.com
d58dd1db25 Merge remote-tracking branch 'origin/upgrade' into upgrade 2023-10-25 10:25:55 +08:00
java_cuibaocheng@163.com
19d3a88fa0 基础人口信息 2023-10-25 10:25:13 +08:00
java_cuibaocheng@163.com
428d9c036b 基础人口信息 2023-10-25 10:04:28 +08:00
TS-QD1
55ee52b9cd 增加插件 2023-10-24 11:55:20 +08:00
Renpc-kilig
cf4887d106 删除旧代码 --renpc 2023-10-24 09:36:34 +08:00
Renpc-kilig
c3c247e7ac 删除旧代码,重构项目分支 --renpc 2023-10-23 17:44:36 +08:00
TS-QD1
941463700b 增加配置 2023-07-12 09:42:18 +08:00
wans
0319a59a08 CityBuildingServiceImpl文件有冲突 解决了冲突 2022-09-22 14:52:38 +08:00