jianjun
|
f2fb554219
|
删除无用方法
|
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
|
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 |
wangxianzhang
|
dd3f09bfe7
|
修改：
找回合并丢失的girdEntity的code字段
|
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 |
|
wangxianzhang
|
7c0a297579
|
修改：
修改excel表头解析方法，使更通用
|
4 years ago |
|
jianjun
|
1cfc400897
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
b3b9bee282
|
处理部分remote
|
4 years ago |
|
yinzuomei
|
242659e3a2
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
yinzuomei
|
e9c4fb99a3
|
分类名赋值
|
4 years ago |
|
yinzuomei
|
19497400f4
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
yinzuomei
|
7e527320d4
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
yinzuomei
|
769363c9ab
|
分类名赋值给category_code
|
4 years ago |
|
zxc
|
2c4a4a5897
|
网格添加结案数
|
4 years ago |
sunyuchao
|
8839b4ea89
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
sunyuchao
|
294ae0e008
|
错提代码问题
|
4 years ago |
|
yinzuomei
|
de569d0a99
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
yinzuomei
|
738d0025b0
|
分页列表查询，增加staffId，查询当前工作人员所属组织及下级
|
4 years ago |
|
yinzuomei
|
ba404ef495
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
yinzuomei
|
ca1490649e
|
分页列表查询，增加staffId，查询当前工作人员所属组织及下级
|
4 years ago |
|
zxc
|
0f41c247a3
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
zxc
|
777aa9e0c0
|
查询房屋信息
|
4 years ago |
|
zxc
|
daba90da7b
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
zxc
|
71b4875446
|
查询房屋信息
|
4 years ago |
|
sunyuchao
|
73eb1c002d
|
居民信息新增 对必填参数进行校验
|
4 years ago |
|
jianjun
|
b265f5646c
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
|
jianjun
|
b7b3015875
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
2a5259c861
|
去掉经济低保字段
|
4 years ago |
|
wangxianzhang
|
47039c9ab3
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
1b4f1de003
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
|
jianjun
|
eb2a4822e2
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
0f6ad0d77c
|
去掉经济低保字段
|
4 years ago |
|
wangxianzhang
|
7b42d87947
|
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/service/impl/IcResiUserServiceImpl.java
|
4 years ago |
|
zxc
|
08e951199f
|
暂存
|
4 years ago |
|
wangxianzhang
|
9c6a66c8d7
|
完成居民基础信息导入
|
4 years ago |
|
jianjun
|
ed8cde38bb
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
lzh
|
a9b7d4760b
|
neighbourHoodId 改neighborHoodId
|
4 years ago |
|
jianjun
|
f8bea6ae44
|
居民信息模版
|
4 years ago |
|
wangxianzhang
|
9818971f0d
|
冲突处理
|
4 years ago |
|
wangxianzhang
|
d818f5e36a
|
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/service/impl/IcResiUserServiceImpl.java
|
4 years ago |
