wangxianzhang
|
c2eba4b183
|
Merge branch 'dev' into dev_ic_diaodong
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
fd4cccef30
|
修复：
1.居民信息导入，排除不必要的列的校验
|
4 years ago |
|
wangxianzhang
|
76ddad1ef1
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
caf71e1e3b
|
修复：
1.调动居民的时候，只增加了调动记录，没增加类别变更记录的bug
|
4 years ago |
yinzuomei
|
1ed094879b
|
Merge remote-tracking branch 'origin/dev_optimize_for_ic' into develop
|
4 years ago |
|
yinzuomei
|
1add5cff17
|
/gov/org/building/treelist返参增加showName
|
4 years ago |
sunyuchao
|
cf5d16830b
|
again
|
4 years ago |
|
yinzuomei
|
094f8a2b43
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
ce8c1e8c7f
|
Merge remote-tracking branch 'origin/dev_optimize_for_ic' into develop
|
4 years ago |
|
wangxianzhang
|
c561d7474a
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
cf5f86dd79
|
修复：
代码错误，编译不通过
|
4 years ago |
|
yinzuomei
|
2f6548cfef
|
/gov/org/building/treelist返参增加showNum
|
4 years ago |
|
wangxianzhang
|
0b1ff57668
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
10c1766501
|
修改：
1.居民导入excel，调整、以及注释的丰富
|
4 years ago |
|
sunyuchao
|
ef9633c537
|
again
|
4 years ago |
|
sunyuchao
|
a0aff3425c
|
again
|
4 years ago |
|
sunyuchao
|
0889bec4ab
|
项目研判分析按分类查询数据兼容市北多层级分类以及不是来源话题的议题补录一条关于话题数据(project_related_personnel) 话题id为空的问题
|
4 years ago |
|
wangxianzhang
|
f5b96ad970
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
69407626f2
|
修改：
1.社区搜索(居民)：conditions为null的bug
2.社区搜索(房屋)：逻辑错误
|
4 years ago |
jianjun
|
b6fa983c5f
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
19aacaa867
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_ic_diaodong
|
4 years ago |
|
jianjun
|
aae6afdaa7
|
local 不打印错误日志
|
4 years ago |
zxc
|
cde0eae6b7
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
182ae42e4d
|
userwarnlist旧接口改造
|
4 years ago |
|
yinzuomei
|
0d3e06d961
|
Merge branches 'dev' and 'dev_ic_diaodong' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_diaodong
|
4 years ago |
|
yinzuomei
|
034cf8e533
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
86317a5505
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
444a169393
|
居民信息里列表分类赋值修改
|
4 years ago |
|
yinzuomei
|
c7e769c08b
|
注释日志
|
4 years ago |
|
zxc
|
cc9c3a2ec4
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
a8aef62c40
|
引入
|
4 years ago |
|
zxc
|
2bf1190645
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
bc45273f95
|
方法改回
|
4 years ago |
zhaoqifeng
|
caad6305f1
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
zhaoqifeng
|
63562c4404
|
组织单位列表展示积分
|
4 years ago |
|
zhaoqifeng
|
33fe28d571
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
zhaoqifeng
|
24dad6271a
|
组织单位列表展示积分
|
4 years ago |
|
jianjun
|
1d2d5abb1f
|
user升级内存 512
|
4 years ago |
|
jianjun
|
bf4e40be39
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
jianjun
|
acebd6ce3e
|
去掉日志
|
4 years ago |
|
sunyuchao
|
6362e43078
|
市北赋能平台查询议题创建人姓名，因没有上传userWechat表 所以改去userbaseinfo表查询
|
4 years ago |
|
zxc
|
2af0f4f38f
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
910cd64bb3
|
sql脚本
|
4 years ago |
|
yinzuomei
|
c693eaf8b6
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
8c10146af4
|
pc录入需求时，展示正常显示的居民
|
4 years ago |
|
wangxianzhang
|
0d19ab0b5a
|
Merge branches 'develop' and 'wxz_blockchain' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
b816a90c1c
|
修改：
项目结案的时候将项目最新信息发送到区块链系统
|
4 years ago |
|
yinzuomei
|
2a2b256c23
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' 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
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
4 years ago |
|
yinzuomei
|
714b14470e
|
Merge branches 'dev' and 'dev_ic_diaodong' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_diaodong
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
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 |
|
wangxianzhang
|
e5e037db13
|
Merge branches 'dev' and 'wxz_blockchain' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_blockchain
|
4 years ago |
