sunyuchao
|
a976335bac
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
sunyuchao
|
94f15fa651
|
居民列表不查询调出客户外的人员
|
4 years ago |
jianjun
|
6e0949e402
|
Merge branch 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
3d8da0b084
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
607d018af1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
09dfcc284f
|
添加 获取网格工作人员接口 加上客户Id
|
4 years ago |
zxc
|
4b4f172723
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
5f1cc671db
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
|
4 years ago |
yinzuomei
|
56b05896e2
|
注释url
|
4 years ago |
|
yinzuomei
|
ef4883c76b
|
注释url
|
4 years ago |
|
zxc
|
7080ac096c
|
地址
|
4 years ago |
|
yinzuomei
|
b46fc9dddb
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
ad0648b803
|
注释url
|
4 years ago |
|
zxc
|
2fcbbbab9d
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
c46606b2b4
|
分类renshu
|
4 years ago |
|
jianjun
|
d7a085d0df
|
添加 获取网格工作人员接口 -》目前是给平阴集成平台使用 总数不对
|
4 years ago |
|
yinzuomei
|
acc57378b9
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
cf7593dd75
|
暂时注释掉需求
|
4 years ago |
|
jianjun
|
2c6c332c8e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
zxc
|
79de7851cf
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
6679c3c6fe
|
分类
|
4 years ago |
wangxianzhang
|
40d0324951
|
Merge branches 'dev_ic_diaodong' and 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
Conflicts:
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
|
4 years ago |
|
yinzuomei
|
28a11104a1
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
# Conflicts:
# epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
4 years ago |
|
yinzuomei
|
6ee54df764
|
居民列表查询
|
4 years ago |
|
sunyuchao
|
404c9c151c
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
sunyuchao
|
9d9a6dc838
|
Merge branch 'dev_bug_syc' into develop
|
4 years ago |
|
sunyuchao
|
39cbf31b83
|
议题详情议题人取成话题人问题
|
4 years ago |
|
sunyuchao
|
f05dc19456
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
jianjun
|
0f3c05f8d7
|
point 配置错误
|
4 years ago |
|
wangxianzhang
|
083c867cd3
|
Merge branches 'dev_ic_diaodong' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
|
4 years ago |
|
wangxianzhang
|
a0d6c4214d
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_diaodong
|
4 years ago |
|
wangxianzhang
|
7eec8535bd
|
新增：
1.完成居民导入,人员的调动和类别的变更
|
4 years ago |
|
jianjun
|
5ed2ee17bf
|
Merge remote-tracking branch 'remotes/origin/dev_py_gridmember' into dev
|
4 years ago |
|
jianjun
|
6b9804fa6a
|
heart 没有配置拦截
|
4 years ago |
|
yinzuomei
|
bb21a26415
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
7292f272d1
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
yinzuomei
|
7501695a20
|
bug
|
4 years ago |
|
jianjun
|
6e976929ee
|
Merge remote-tracking branch 'remotes/origin/dev_ic_diaodong' into develop
|
4 years ago |
|
jianjun
|
e3c49b30fb
|
把批量导出改为1w 每次查询
|
4 years ago |
|
yinzuomei
|
e1fc52922d
|
Merge branches 'dev' and 'dev_ic_diaodong' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_diaodong
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
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 |
|
sunyuchao
|
5500927187
|
从跟组织开始查询组织网格树
|
4 years ago |
|
yinzuomei
|
8062dda2b4
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
853f6c1d19
|
个人档案-上报时间，按上报时间降序
|
4 years ago |
|
jianjun
|
8d9252f174
|
Merge remote-tracking branch 'remotes/origin/develop' into release_temp
|
4 years ago |
|
jianjun
|
55775dee6d
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
acb8904da7
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
d7ee218258
|
微调
|
4 years ago |
|
jianjun
|
936c13bbf9
|
微调
|
4 years ago |
|
yinzuomei
|
15f169f19b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
dd887c372c
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
