jianjun
|
6dc50b5b10
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_ic_platform
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
4 years ago |
zhaoqifeng
|
ebe64c6f8d
|
项目提取分类
|
4 years ago |
|
jianjun
|
54f51d1805
|
代码微调
|
4 years ago |
|
jianjun
|
c5947de75c
|
调整 项目上传代码结构
|
4 years ago |
wangxianzhang
|
0d4ece959a
|
修改：
1.居民信息导入，增加items中columnName和columnNum的拼接，共同组成columnName
|
4 years ago |
sunyuchao
|
a3733f35cc
|
居民信息变动 mq推送调整
|
4 years ago |
|
jianjun
|
3bc7126add
|
获取服务器地址方法修改
|
4 years ago |
|
zhaoqifeng
|
1007f7cc6b
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
17a41ad669
|
网格的治理指数 修改
|
4 years ago |
|
jianjun
|
41d1428f02
|
代码微调
|
4 years ago |
zxc
|
dc75cb8eb5
|
Merge remote-tracking branch 'origin/dev_add_closedCount_category' into dev
|
4 years ago |
|
zxc
|
ee857c71a9
|
查询客户组织不存在
|
4 years ago |
lzh
|
4c24b8b7a4
|
增加是否预警字段
|
4 years ago |
|
jianjun
|
ebad0df532
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_ic_platform
|
4 years ago |
|
zhaoqifeng
|
b7313ba0d2
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
90873a38bd
|
下级组织的治理指数修改
|
4 years ago |
|
jianjun
|
626443cfc2
|
根据客户id 获取预警配置
|
4 years ago |
|
jianjun
|
595fac05ff
|
user 测试 生产环境mq consumer配置
|
4 years ago |
|
jianjun
|
5773496285
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
ba4fc0454d
|
gateway排除 redisson
|
4 years ago |
|
jianjun
|
3497e41e5d
|
代码微调
|
4 years ago |
|
zhaoqifeng
|
de2f4f0c67
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
d0ef6d9a65
|
下级组织的治理指数修改
|
4 years ago |
|
lzh
|
a0caaa96e1
|
更新时去掉设置customerId
|
4 years ago |
|
lzh
|
08e84a5b4f
|
配置类别列表过滤
|
4 years ago |
|
jianjun
|
f96d48a3bf
|
分类预警配置 错误信息修改
|
4 years ago |
|
jianjun
|
e68ca8a448
|
改了个名
|
4 years ago |
|
jianjun
|
dec8498fe0
|
代码调整
|
4 years ago |
|
jianjun
|
81a8faaaf3
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
ee37a94113
|
代码调整
|
4 years ago |
|
zhaoqifeng
|
3e73458b7d
|
房屋查询党员放在最前面
|
4 years ago |
|
zhaoqifeng
|
ef755fd152
|
房屋查询党员放在最前面
|
4 years ago |
|
wangxianzhang
|
9446a53b3a
|
修改：
ResultDataResolver.java，方法增加showMessage参数
|
4 years ago |
yinzuomei
|
0ed47e7c68
|
ic_resi_demand_dict迁移到heart,查询分类名称
|
4 years ago |
|
yinzuomei
|
170e3fc2b6
|
ic_resi_demand_dict迁移到heart
|
4 years ago |
|
sunyuchao
|
4c594eb4c2
|
新增字典表数据查询通用接口
|
4 years ago |
|
wangxianzhang
|
57c279de57
|
修复
1.ic用户导入 修复gridoption接口的适配问题
|
4 years ago |
|
wangxianzhang
|
709ce49ceb
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
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
|
b016bbe6d6
|
代码微调
|
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
|
4a52bf11c8
|
代码逻辑优化调整1
|
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 |
