epmet-cloud-lingshan

844d52059e Merge branch 'lingshan_master' into dev wxz 2023-05-09 16:01:16 +0800
b6501fdcea Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-05-09 16:00:26 +0800
cc41cb420a 【红色代办】做了一点，提交一版 wxz 2023-05-09 15:56:48 +0800
8db4108269 ic_building新增BUILDING_LEADER_ID_CARD、BUILDING_LEADER_TYPE yinzuomei 2023-05-09 15:48:35 +0800
2caacf8306 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-09 14:52:46 +0800
4d2ba136e8 删除楼长，同时清空ic_building yinzuomei 2023-05-09 14:49:08 +0800
9608a4fb86 经与项目经理确认，删除物业，直接删除无需判断下面是否关联小区。且别的社区在用此物业，也可以删除。清除所有小区的关系 yinzuomei 2023-05-09 14:25:50 +0800
27ce270c34 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-09 13:50:41 +0800
9b920e5256 111 yinzuomei 2023-05-09 13:47:40 +0800
fcb374a34f 111 yinzuomei 2023-05-09 13:45:57 +0800
94083d003f Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-09 13:36:46 +0800
5a79a05564 批量删除物业：/gov/org/propertymanagement/delete-batch yinzuomei 2023-05-09 13:34:54 +0800
8f1d8f942d Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-09 13:19:49 +0800
de6311a50b 批量删除物业：/gov/org/propertymanagement/delete-batch yinzuomei 2023-05-09 13:16:52 +0800
e469921905 批量删除物业：/gov/org/propertymanagement/delete-batch yinzuomei 2023-05-09 12:58:07 +0800
dd8eb84ecb /gov/org/communityBuildingManager/import,未完待续 yinzuomei 2023-05-09 12:33:50 +0800
7c27a99c5b /gov/org/communityBuildingManager/import,未完待续 yinzuomei 2023-05-09 12:27:11 +0800
73a98fe99e /gov/org/communityBuildingManager/import yinzuomei 2023-05-09 12:23:29 +0800
90f0ddbff1 物业名称必填 yinzuomei 2023-05-09 12:18:11 +0800
cbf8b3eb2d Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-09 12:08:31 +0800
7b49486eda /gov/org/propertymanagement/update yinzuomei 2023-05-09 12:06:08 +0800
398715e44d Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-09 11:58:29 +0800
3d68e3a2a0 物业导入，名称一致，覆盖数据库的信息，以excel填写的为准 yinzuomei 2023-05-09 11:53:51 +0800
38daeb0426 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-09 11:37:47 +0800
2be44668f2 /gov/org/propertymanagement/page yinzuomei 2023-05-09 11:23:29 +0800
a6015e0aed /gov/org/communityBuildingManager/export yinzuomei 2023-05-09 11:21:06 +0800
372761f0b0 /gov/org/communityBuildingManager/export yinzuomei 2023-05-09 11:16:45 +0800
bc4c996af5 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-09 10:50:43 +0800
a8025880e7 楼长单元长这，同一个楼，只允许有一个楼长，同一个单元，只允许有一个单元长。 yinzuomei 2023-05-09 10:41:01 +0800
a01720c755 楼长单元长这，新增或者编辑时，不论类型是啥，单元都可以不填 yinzuomei 2023-05-09 10:26:07 +0800
8c5b0a7d7b Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-09 10:08:16 +0800
cfe0b593f9 楼长单元长导出类型 yinzuomei 2023-05-09 10:01:26 +0800
1adc1107f0 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-09 09:52:06 +0800
f4e8064de0 物业导入模板调整，楼长单元长下载模板，导出 yinzuomei 2023-05-09 09:48:01 +0800
9431110e84 物业导入模板调整，楼长单元长下载模板，导出 yinzuomei 2023-05-09 09:44:39 +0800
9914555f16 物业导入模板调整：*物业名称，字体红色 yinzuomei 2023-05-09 09:26:46 +0800
bfba187bae Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-08 18:15:37 +0800
ee03b9721c Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master lichao 2023-05-08 17:59:54 +0800
228cc6ddba 房屋修改 lichao 2023-05-08 17:59:47 +0800
fb3b0a806d Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-08 17:47:52 +0800
3c6dde7d66 修改物业，取消勾选的小区，删除物业关系表 yinzuomei 2023-05-08 17:43:39 +0800
17dfaef3c9 解决冲突 lichao 2023-05-08 17:20:09 +0800
a232c79bfe Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-08 16:55:48 +0800
d9dadb7c2f 工作人员 lichao 2023-05-08 16:52:43 +0800
048634b65c Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-08 16:43:55 +0800
22629e2ae7 Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master lichao 2023-05-08 16:43:39 +0800
b93e868fcd Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master lichao 2023-05-08 16:41:55 +0800
61e8a5a41a 物业下载模板 yinzuomei 2023-05-08 16:41:03 +0800
a2dfc8c28d 小区详情 lichao 2023-05-08 16:40:36 +0800
26d9933945 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-05-08 16:39:49 +0800
ac12e2d189 物业详情返回小区id yinzuomei 2023-05-08 16:39:15 +0800
536b08f5d3 Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-08 16:20:47 +0800
92cfd3d0c9 小区列表 lichao 2023-05-08 16:20:01 +0800
21961b209a Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-08 15:36:05 +0800
f65444fa97 物业管理管理小区数量计算：添加备注 yinzuomei 2023-05-08 15:31:25 +0800
958b97a2a0 物业管理管理小区数量计算：当前物业在本组织及下级管理的小区数 yinzuomei 2023-05-08 15:29:08 +0800
fbefe607e5 物业管理，管理小区数量 yinzuomei 2023-05-08 15:21:37 +0800
85705bcbe4 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-08 15:07:10 +0800
3950243152 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-08 15:01:35 +0800
f5bbb9314f 物业管理，管理小区数量 yinzuomei 2023-05-08 14:56:13 +0800
6cf3547b01 物业管理，查看详情 yinzuomei 2023-05-08 14:54:11 +0800
5022b296ed Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-08 14:44:07 +0800
1506ca4d34 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-05-08 14:39:13 +0800
1a8cf48938 物业管理，导入 yinzuomei 2023-05-08 14:38:52 +0800
8e302e95d9 Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-08 14:21:06 +0800
546954b098 工作人员模板 lichao 2023-05-08 14:18:44 +0800
96a1c8e628 物业管理，管理小区 yinzuomei 2023-05-08 14:10:55 +0800
ad072ea729 物业管理，导出+下载模板 yinzuomei 2023-05-08 13:34:31 +0800
fe6fd96254 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-05-07 14:40:26 +0800
7a8cd6135c 居民信息导入，模板调整，为浪潮，添加了很多列 yinzuomei 2023-05-07 14:39:47 +0800
c6503f9784 Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-07 14:26:05 +0800
eee252b0eb 修改 lichao 2023-05-07 14:25:46 +0800
430d78eaac Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-07 10:08:57 +0800
44a487f205 居民信息新增的与户主关系、证件类型、重点人群、人口类型、政治面貌、是否现居住、户别,试试可不可以导出2 yinzuomei 2023-05-07 10:06:28 +0800
f9031d61c5 居民信息新增的与户主关系、证件类型、重点人群、人口类型、政治面貌、是否现居住、户别,试试可不可以导出 yinzuomei 2023-05-07 10:01:52 +0800
aea33dc281 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-07 09:24:20 +0800
c4dd042be2 居民信息ic_resi_user增加户籍、居住等21列 yinzuomei 2023-05-07 09:19:52 +0800
00de29ab28 户籍所在地，修改注释，对应浪潮那的户籍详细地址 yinzuomei 2023-05-07 09:17:26 +0800
6e771a6d2d 烟台需求：与户主关系（60）对应字典表dict_type:yt_Householder_relationship_type yinzuomei 2023-05-06 21:15:07 +0800
c7b0737836 烟台居民信息增加重点人群、国籍、人口类型、整治面貌；修改证件类型值 yinzuomei 2023-05-06 20:43:04 +0800
0a85080a93 Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-06 19:39:16 +0800
c2d026d09f Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master lichao 2023-05-06 19:39:03 +0800
049c9b47af 新增客户修改 lichao 2023-05-06 19:38:53 +0800
fe1479c077 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-06 18:54:13 +0800
48183b6fe8 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-05-06 18:48:31 +0800
1de597c2c2 dictOption/{dictType} yinzuomei 2023-05-06 18:48:06 +0800
e6a296ddaf Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-06 18:31:48 +0800
05f60d3778 新增详情 lichao 2023-05-06 18:31:14 +0800
7eb166e073 修改组织 lichao 2023-05-06 18:28:45 +0800
c35180fec0 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-06 18:05:40 +0800
e645887c25 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-05-06 18:02:13 +0800
d3009dfeaf 新增和编辑居民，证件类型必填 yinzuomei 2023-05-06 18:01:52 +0800
748d5a375c Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-06 16:11:09 +0800
6f58e99138 房屋新增 lichao 2023-05-06 16:10:43 +0800
8ed6ceb97b Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-06 15:47:21 +0800
6453e1c296 区县、街道、社区下拉框 yinzuomei 2023-05-06 15:43:52 +0800
1d6f0a7854 楼栋单元长fix yinzuomei 2023-05-06 15:25:18 +0800
9e75d3f936 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-06 15:06:33 +0800
eab3d329f1 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-05-06 15:01:04 +0800
923997363b Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-06 14:59:26 +0800

Commit Graph Select branches Hide Pull Requests master Mono Color

Commit Graph

Select branches

Hide Pull Requests

master