sunyuchao
|
786c30f0f7
|
.
|
4 years ago |
zxc
|
ac943f33a8
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
4 years ago |
|
zxc
|
68e48b972e
|
人员分类接口调整
|
4 years ago |
yinzuomei
|
d569a6ef32
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
11162c3cd9
|
服务事项历史数据修改：联建单位置空，联建活动（总结）修改为新的编码，发布的联建活动改为新的编码
|
4 years ago |
|
sunyuchao
|
afb211a08e
|
bug修改
|
4 years ago |
|
yinzuomei
|
e7f792f800
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
f9c71352f2
|
联建活动用到服务事项的地方，统一改为查询ic_service_item_dict
|
4 years ago |
wangxianzhang
|
903d1e1406
|
Merge branches 'develop' and 'wxz_blockchain' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
a286d4030f
|
修改：
1.区块链用户身份认证调整，增加字段，url变化
|
4 years ago |
|
yinzuomei
|
2512d0ca36
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
yinzuomei
|
833521d1d4
|
新增联建单位时，服务事项列表，接口改为：/api/heart/serviceitem/dict-list
|
4 years ago |
|
zxc
|
a0cce1cf7a
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
1ac84de0ff
|
加了个ID
|
4 years ago |
|
sunyuchao
|
3ff2184df2
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
sunyuchao
|
4bda9cc782
|
初始化居民变更记录和变更明细数据
|
4 years ago |
jianjun
|
2feb177267
|
优化插入 分批一次1000
|
4 years ago |
|
yinzuomei
|
1b0741285d
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
ba8461dd33
|
-10修改
|
4 years ago |
|
wangxianzhang
|
ca169ed443
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_diaodong
Conflicts:
epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
4 years ago |
|
wangxianzhang
|
55df17060c
|
新增：
1.完成居民导入，主表的类别变更过滤
|
4 years ago |
|
sunyuchao
|
e40b0ca92c
|
初始化居民变更记录和变更明细数据
|
4 years ago |
|
yinzuomei
|
40f551ef63
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
3ffefcc6d4
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
yinzuomei
|
f339dd6bd9
|
type
|
4 years ago |
|
wangxianzhang
|
75d2617f88
|
Merge branches 'dev_ic_diaodong' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
d563ac9e31
|
fix
|
4 years ago |
|
jianjun
|
932dd734fc
|
项目数据统计分批查询1w 试下
|
4 years ago |
|
jianjun
|
9033087896
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
wangxianzhang
|
35e325d3af
|
Merge branches 'dev_ic_diaodong' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
8553e469cb
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
|
4 years ago |
|
jianjun
|
ecf497bc45
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
49639d6d19
|
获取当前组织下的工作人员 组织/部门/网格下人员列表 【组织添加的工作人员】
|
4 years ago |
|
jianjun
|
7ba2f4d99e
|
获取当前组织下的工作人员 组织/部门/网格下人员列表
|
4 years ago |
|
wangxianzhang
|
2aab12f433
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
ecd1b062b6
|
fix:
社区查询修改导致房屋列表错误
|
4 years ago |
|
yinzuomei
|
a271c2f4b5
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
# Conflicts:
# epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
# epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
|
4 years ago |
|
yinzuomei
|
943f3530c5
|
类别分析，定时任务
|
4 years ago |
|
yinzuomei
|
6cfe2b37e8
|
人员类别分析-3个数查询
|
4 years ago |
|
wangxianzhang
|
7ea90a9747
|
Merge branch 'dev' into develop
|
4 years ago |
|
wangxianzhang
|
dbe6ae2fb0
|
修改：
1.resi-home/resi-hall的hystrix最大线程个数
|
4 years ago |
|
jianjun
|
052a3e64b2
|
Merge remote-tracking branch 'remotes/origin/dev_upgrade_mybatis_plus' into dev
|
4 years ago |
|
yinzuomei
|
4e6ec478d0
|
人员类别分析列表
|
4 years ago |
|
jianjun
|
573f4c03fc
|
Merge branch 'dev_shibei_task' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
9db1ab0b60
|
数字社区单独部署 支持的定时任务 拆分2个任务
|
4 years ago |
|
jianjun
|
bda1d1a0de
|
Merge branches 'develop' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
b8933cf8d3
|
Merge branch 'dev_shibei_task' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
78f493cee9
|
数字社区单独部署 支持的定时任务 拆分2个任务
|
4 years ago |
|
sunyuchao
|
f4c74f2454
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
sunyuchao
|
1319a1d65b
|
人员变更明细表增加pids字段
|
4 years ago |
