zxc
|
7d790f8e83
|
emm
|
4 years ago |
|
zxc
|
8d8a9cd94c
|
dto,entity修改
|
4 years ago |
|
zxc
|
dc6ec6e8b9
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
|
4 years ago |
|
zxc
|
483046df86
|
社区自组织，党群服务中心自生成
|
4 years ago |
sunyuchao
|
8e78d5c48e
|
社会组织新增
|
4 years ago |
|
sunyuchao
|
45655d9c75
|
九小场所、社会组织代码生成
|
4 years ago |
yinzuomei
|
21b0d1913c
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
yinzuomei
|
0ed47e7c68
|
ic_resi_demand_dict迁移到heart,查询分类名称
|
4 years ago |
|
yinzuomei
|
ede8507903
|
Merge remote-tracking branch 'origin/dev_ic_platform' into develop
|
4 years ago |
|
yinzuomei
|
170e3fc2b6
|
ic_resi_demand_dict迁移到heart
|
4 years ago |
|
sunyuchao
|
38ff3583fe
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
sunyuchao
|
4c594eb4c2
|
新增字典表数据查询通用接口
|
4 years ago |
wangxianzhang
|
b30289697d
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
57c279de57
|
修复
1.ic用户导入 修复gridoption接口的适配问题
|
4 years ago |
|
wangxianzhang
|
8672ca7b4f
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
wangxianzhang
|
fbb6c0b11d
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
wangxianzhang
|
709ce49ceb
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
jianjun
|
79e1d83708
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
a32a161ca6
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
9aa0a913a5
|
bug
|
4 years ago |
|
wangxianzhang
|
d8ed0636ad
|
修复
1.ic用户导入 修复gridoption接口的适配问题
|
4 years ago |
|
jianjun
|
f390f0fcc6
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
9c7f86e72f
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
|
jianjun
|
b016bbe6d6
|
代码微调
|
4 years ago |
|
wangxianzhang
|
4d004d9bc7
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
4e2cbd9003
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
wangxianzhang
|
25c15b68d7
|
修复
1.ic用户导入 上传目录初始化问题
|
4 years ago |
|
sunyuchao
|
23cb79f88a
|
mq触发的方法变动
|
4 years ago |
lzh
|
1491c26a2b
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_platform
|
4 years ago |
|
lzh
|
e6316a214d
|
更改level
|
4 years ago |
|
jianjun
|
877924abd4
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
|
jianjun
|
4a52bf11c8
|
代码逻辑优化调整1
|
4 years ago |
|
jianjun
|
43d95d1adb
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
|
jianjun
|
1f5ef1bce7
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
5b3d586afb
|
获取表单项直接从参数获取客户id
|
4 years ago |
|
sunyuchao
|
408fbde61c
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
sunyuchao
|
80f0293450
|
九小场所接口增加返参；居民信息变动触发mq接入预警统计重新计算方法
|
4 years ago |
|
jianjun
|
36f03d31d1
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
|
jianjun
|
f244d64d78
|
解决多实例bug问题
|
4 years ago |
|
jianjun
|
dc27784309
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
b2af5948e4
|
修改模版路径
|
4 years ago |
|
jianjun
|
b6f1a9ed56
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
8ed5524ae9
|
一次查询500
|
4 years ago |
|
jianjun
|
6db5026402
|
一次查询200
|
4 years ago |
|
jianjun
|
e3583c0d80
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java
|
4 years ago |
|
jianjun
|
c1f78bc394
|
动态模版实现
|
4 years ago |
|
jianjun
|
2a143b8c39
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
|
lzh
|
343785a88c
|
楼宇预警数量列表和人员列表修改
|
4 years ago |
|
jianjun
|
e6a164efac
|
释放该释放的锁 up
|
4 years ago |
|
jianjun
|
df458b9533
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
