wangxianzhang
|
cd5ab4a3a6
|
修改：
pc工作端登录缓存增加部分内容
|
4 years ago |
yinzuomei
|
0b5ae8ace9
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
d8e916fdca
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
yinzuomei
|
a20a520d1e
|
NEIGHBOOR_NAME_EXITED
|
4 years ago |
zxc
|
bf6ab64069
|
Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop
|
4 years ago |
|
zxc
|
4b6481b504
|
默认值
|
4 years ago |
|
yinzuomei
|
dad3ea4450
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
yinzuomei
|
a5a5e24449
|
fadignding
|
4 years ago |
|
yinzuomei
|
bbe9584243
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
yinzuomei
|
08ad7e651e
|
@PostMapping("buildingunitlist")找回
|
4 years ago |
|
yinzuomei
|
e1062ea8e0
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
yinzuomei
|
a647537910
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
yinzuomei
|
c7a1d433ab
|
小区名和门牌号唯一
|
4 years ago |
lzh
|
5d880c618d
|
代码给覆盖了，重新提交
|
4 years ago |
|
yinzuomei
|
2adf5b6280
|
同一小区内楼栋名称不允许重复
|
4 years ago |
zhaoqifeng
|
6dce514905
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
85b0d26503
|
【基础信息】搜索人名
|
4 years ago |
|
zhaoqifeng
|
4cb2d2fa64
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
2cc38c1cc3
|
【基础信息】家庭 查询房屋修改
|
4 years ago |
|
zhaoqifeng
|
f6edc63ab7
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
3063afb3a0
|
【基础信息】家庭 查询房屋修改
|
4 years ago |
jianjun
|
174bde7004
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
0a69058618
|
Merge branch 'dev_add_closedCount_category' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
64698b1ebb
|
删除测试参数
|
4 years ago |
|
wangxianzhang
|
decde9f009
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
jianjun
|
89a29eb4f2
|
Revert "合并问题"
This reverts commit 08a358dd
|
4 years ago |
|
jianjun
|
b0816517b1
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
08a358dd71
|
合并问题
|
4 years ago |
|
wangxianzhang
|
56ab29a97d
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
zxc
|
7eec94a97a
|
去除多余
|
4 years ago |
|
wangxianzhang
|
3ea4aac18c
|
修改：
icform/items增加redis缓存
|
4 years ago |
|
zxc
|
266c971a96
|
Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop
|
4 years ago |
|
zxc
|
e975ac29ee
|
项目数
|
4 years ago |
|
zxc
|
6f3f462587
|
Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop
|
4 years ago |
|
zxc
|
5041656101
|
Merge remote-tracking branch 'origin/dev_add_closedCount_category' into dev_add_closedCount_category
|
4 years ago |
|
zxc
|
eae981d109
|
mingzi
|
4 years ago |
|
jianjun
|
2d6d0e0b85
|
项目列表导出
|
4 years ago |
|
zxc
|
e1e31c5a6f
|
个人数据
|
4 years ago |
|
zxc
|
dbd38be21e
|
Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop
|
4 years ago |
|
zxc
|
ba7c4b1410
|
添加父级parentCode
|
4 years ago |
|
zxc
|
2bbecd1005
|
新增返回字段
|
4 years ago |
|
wangxianzhang
|
74cc2e3f48
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
wangxianzhang
|
816a08c9e6
|
修改：
1.已存在的ic居民相关信息，修改，而不跳过
|
4 years ago |
|
zhaoqifeng
|
3eb2d28cc1
|
【基础信息】搜索人名
|
4 years ago |
|
jianjun
|
89e85477cb
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
07a305659a
|
Merge branch 'dev_ic_platform' 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/govorg/GovOrgService.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
|
4 years ago |
|
jianjun
|
aeb0c4511a
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
7bf2cdefd4
|
所属支部固定处理 代调整
|
4 years ago |
|
zxc
|
9e3faebf7c
|
个人数据
|
4 years ago |
|
zxc
|
cf009d463a
|
Merge remote-tracking branch 'origin/dev_add_closedCount_category' into dev_ic_platform
# 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 |
