jianjun
|
20236af3b5
|
Merge branch 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
eafe131854
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
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
|
454e21f27f
|
Merge branch 'dev' into release_temp
|
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 |
|
jianjun
|
7d6d4a47d1
|
Merge remote-tracking branch 'remotes/origin/develop' into release_temp
|
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 |
zxc
|
702799a420
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
ba6e4d04c4
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
jianjun
|
5799948f48
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
zxc
|
415863852b
|
房屋名
|
4 years ago |
|
jianjun
|
583b4087ec
|
Merge remote-tracking branch 'remotes/origin/dev_shibei_task' into develop
|
4 years ago |
|
jianjun
|
81aa2ebe73
|
Merge branch 'dev_py_gridmember' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_py_gridmember
|
4 years ago |
|
jianjun
|
e9840e3b05
|
Merge branch 'dev_shibei_task' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_py_gridmember
|
4 years ago |
|
jianjun
|
7ecdff5382
|
数字社区单独部署 支持的定时任务
|
4 years ago |
|
jianjun
|
e7fb45b949
|
数字社区单独部署 支持的定时任务
|
4 years ago |
|
sunyuchao
|
bad85a2f01
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
c6eecad585
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
yinzuomei
|
719b403d34
|
人员变更记录类别字典表：迁入，迁出，类别，新增
|
4 years ago |
|
sunyuchao
|
e54149303e
|
人员变更记录
|
4 years ago |
|
zxc
|
e6274f4a92
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
3cbb59cd91
|
房屋缓存
|
4 years ago |
|
jianjun
|
398c946994
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
5d8a38f04f
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
yinzuomei
|
af777cb478
|
网格人员类别分析
|
4 years ago |
|
jianjun
|
a9f40e8434
|
Merge branch 'dev_py_gridmember' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
bcd20d0148
|
获取网格内工作人员 去掉客户id
|
4 years ago |
|
zxc
|
093bcf986e
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
cbe0ff7d87
|
房屋缓存
|
4 years ago |
|
sunyuchao
|
e36b059e09
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
sunyuchao
|
fb2bdcb0e1
|
人员状态、人员调动、变更记录、变更明细sql脚本
|
4 years ago |
|
jianjun
|
b3dadd3157
|
Merge remote-tracking branch 'remotes/origin/develop' into release_temp
|
4 years ago |
zhaoqifeng
|
96bad8f23b
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
