zxc
|
f6dbe5dba4
|
Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop
|
4 years ago |
|
zxc
|
1e30a72cac
|
项目列表
|
4 years ago |
|
zxc
|
80c9bf9f55
|
Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
|
4 years ago |
|
zxc
|
3a07521d40
|
查询组织网格信息
|
4 years ago |
|
zxc
|
69e0e11c36
|
Merge remote-tracking branch 'origin/dev_add_closedCount_category' into dev_add_closedCount_category
|
4 years ago |
|
zxc
|
ae93f390bd
|
项目
|
4 years ago |
jianjun
|
395ed3adf8
|
删除多余的方法
|
4 years ago |
|
jianjun
|
ef484d6af8
|
删除多余的方法
|
4 years ago |
|
jianjun
|
908e6a496a
|
Merge remote-tracking branch 'remotes/origin/dev_add_closedCount_category' into develop
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
|
4 years ago |
|
jianjun
|
b2f40e8ad9
|
获取组织和网格树 网格加到组织里面 平级
|
4 years ago |
yinzuomei
|
6caa092c4c
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
20a9eef1e4
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
yinzuomei
|
f83ee0bb46
|
删除方法被删，还原
|
4 years ago |
|
yinzuomei
|
7e53dd90eb
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
ebd7be79e8
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
yinzuomei
|
5353ce8fb2
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
yinzuomei
|
5ea973af03
|
getcustomerform调整
|
4 years ago |
|
jianjun
|
9920de9cb3
|
Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into dev_add_closedCount_category
|
4 years ago |
zhaoqifeng
|
3d71a6f033
|
个人信息-家庭关系
|
4 years ago |
lzh
|
c1d91e9dc5
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform
|
4 years ago |
|
lzh
|
4a446b7d71
|
居民类别配置
|
4 years ago |
sunyuchao
|
84cc673e3f
|
mq事件DTO名字调整
|
4 years ago |
wangxianzhang
|
6e8138ecd0
|
修改：
调整ic居民导入，将导入逻辑移到单独的service中IcResiUserImportService
|
4 years ago |
|
wangxianzhang
|
c1531d3e06
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
4eb0f5c0cb
|
修改：
完成excel表格的基本导入
下一步：健壮性判断，失败记录，excel上传
|
4 years ago |
|
yinzuomei
|
40390b4020
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
9fb8117080
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
yinzuomei
|
78f1abeda2
|
agg原接口代码删除
|
4 years ago |
|
sunyuchao
|
41d249672a
|
居民信息新增、变更推送mq
|
4 years ago |
|
jianjun
|
adcc4de766
|
Merge remote-tracking branch 'remotes/origin/develop' into release_temp
|
4 years ago |
|
jianjun
|
77d1545526
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
|
jianjun
|
f2fb554219
|
删除无用方法
|
4 years ago |
|
yinzuomei
|
cceabfd370
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
3e745d2325
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
yinzuomei
|
c5d81c2780
|
bug#2306
|
4 years ago |
|
zxc
|
ee5f7ff5f1
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
8eb156dd87
|
Merge branch 'dev_add_closedCount_category' into develop
|
4 years ago |
|
zxc
|
65afa8291c
|
emm
|
4 years ago |
|
jianjun
|
26e59edca5
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
25eeb9787c
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
fd0edf1ca1
|
居民导出
|
4 years ago |
|
zxc
|
9e28548f42
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
wangxianzhang
|
dd3f09bfe7
|
修改：
找回合并丢失的girdEntity的code字段
|
4 years ago |
|
zxc
|
d3d910eb5a
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
3f384a43e8
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
e288bd342d
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
yinzuomei
|
03750f51f8
|
分类查询修改
|
4 years ago |
|
zxc
|
aad72669c1
|
Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop
|
4 years ago |
|
zxc
|
72d9f19283
|
项目分类已结案的项目数
|
4 years ago |
|
wangxianzhang
|
bcc80300be
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform
|
4 years ago |
