yinzuomei
|
c12acd6c14
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
2 years ago |
|
yinzuomei
|
ba94f0b41d
|
等会再改
|
2 years ago |
|
yinzuomei
|
d9a8ce711a
|
等会再改
|
2 years ago |
|
yinzuomei
|
662d68a165
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
2 years ago |
|
yinzuomei
|
547f9da83d
|
新增，编辑，删除居民，更新房屋是否是党员中心户
|
2 years ago |
|
yinzuomei
|
fdf9a82f62
|
去掉一个GovOrgOpenFeignClient
|
2 years ago |
|
yinzuomei
|
cc18fc8dc8
|
直接在dev改
|
2 years ago |
luyan
|
3164b2bee6
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
f804020c6d
|
增加事件回复表单参数；
|
2 years ago |
|
yinzuomei
|
cb1d4fb2dd
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
f664a2eb10
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
aebfdf7239
|
修改事件，增加处理流程表单参数
|
2 years ago |
|
luyan
|
ab8c6f89e2
|
优化依赖关系
|
2 years ago |
|
yinzuomei
|
d43275feaf
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
b0d9d88526
|
常量参数
|
2 years ago |
|
luyan
|
9ec541a4f7
|
移除钉钉
|
2 years ago |
|
yinzuomei
|
008a2aae1e
|
baseDao.selectListPartyCenterHouse(
|
2 years ago |
|
luyan
|
b9d9fdbee7
|
移除钉钉
|
2 years ago |
|
luyan
|
bffd011bb3
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
b0b9e9e350
|
移除新增事件管理
|
2 years ago |
|
yinzuomei
|
3eb3ef92ca
|
合并冲突
|
2 years ago |
|
yinzuomei
|
b5d347347f
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
|
2 years ago |
|
yinzuomei
|
fe5d764f26
|
queryLianHuHouse
|
2 years ago |
|
yinzuomei
|
eda679a8d9
|
绑定联户入参调整
|
2 years ago |
|
yinzuomei
|
3ab1782fa5
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
wxz
|
f9481afd6b
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
543acebce2
|
partyCenterHouseFlag
|
2 years ago |
|
yinzuomei
|
c19a23c44e
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
88da1b9907
|
修改:【灵山-红色待办】大屏-服务列表，增加agentId代办员id参数
|
2 years ago |
|
yinzuomei
|
75b5d35463
|
网格下的小区树：gov/org/ichouse/housetree
|
2 years ago |
|
wxz
|
7f907fd422
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
73c04875b9
|
fix:【灵山-红色待办】居民端提交，缺少经纬度字段保存
fix:【灵山-红色待办】大屏中央，代办员，服务的数量查询错误
|
2 years ago |
|
wxz
|
1285327a7c
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
2 years ago |
|
yinzuomei
|
722cd256d9
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
8c0de433b5
|
联户绑定，可任意勾选小区/楼栋/单元/房屋
|
2 years ago |
|
wxz
|
9d269d79da
|
Merge branch 'lingshan_master' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
|
2 years ago |
|
wxz
|
6f9578f3f6
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
79167af633
|
党建引领：大屏中央，当相关对象目录数量查询错误
|
2 years ago |
|
yinzuomei
|
fcfa14bffd
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
4497b26210
|
未完待续。。。md
|
2 years ago |
|
wxz
|
1d90fde163
|
增加办结率数值返回
|
2 years ago |
|
wxz
|
aa634ef0eb
|
Merge branch 'lingshan_master' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
|
2 years ago |
|
wxz
|
bdf159522c
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
51fc695173
|
fix:【灵山大屏】代办服务类型分析报错
|
2 years ago |
|
yinzuomei
|
c3091361ed
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
5c9d9c2995
|
灵山：绑定联户
|
2 years ago |
|
wxz
|
78a96ecd23
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
defddf443f
|
fix:【灵山大屏】党组织树查询党员查不到的bug
|
2 years ago |
|
yinzuomei
|
7698e0592b
|
ic_house房屋表新增：PARTY_CENTER_HOUSE_FLAG：灵山项目：是否党员中心户：1是；0不是
|
2 years ago |
|
wxz
|
0c482607b9
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
