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 |
|
yinzuomei
|
533af7f388
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
655c534c40
|
已经占用的编码也不能再使用
|
4 years ago |
|
yinzuomei
|
f1bd3e71f0
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
e1948c532a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
bf494e34c1
|
需求分类名称唯一。
|
4 years ago |
|
jianjun
|
b4c479b68f
|
Merge branch 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
5d7b749e55
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
3479159850
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
4 years ago |
|
jianjun
|
7d8185fd4b
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
4 years ago |
|
jianjun
|
918811e179
|
添加表单配置枚举类 IcFormCodeEnum
|
4 years ago |
|
sunyuchao
|
9f34f97f44
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
b09d2f99ff
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
sunyuchao
|
91df125073
|
Merge branch 'dev_ic_diaodong' into develop
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
4 years ago |
|
sunyuchao
|
786c30f0f7
|
.
|
4 years ago |
|
zxc
|
c6b26b06d0
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
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
|
70d608ebf6
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
d569a6ef32
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
11162c3cd9
|
服务事项历史数据修改：联建单位置空，联建活动（总结）修改为新的编码，发布的联建活动改为新的编码
|
4 years ago |
