jianjun
|
503d44cb20
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
9d2e5c5558
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
lzh
|
4c24b8b7a4
|
增加是否预警字段
|
4 years ago |
zxc
|
0c3de78432
|
Merge remote-tracking branch 'origin/dev_add_closedCount_category' into develop
|
4 years ago |
|
jianjun
|
ebad0df532
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_ic_platform
|
4 years ago |
zhaoqifeng
|
90873a38bd
|
下级组织的治理指数修改
|
4 years ago |
|
jianjun
|
69b8df13dd
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
c210d18950
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into release_temp
|
4 years ago |
|
jianjun
|
a8028984a5
|
Merge remote-tracking branch 'remotes/origin/develop' into release_temp
|
4 years ago |
|
jianjun
|
d711cc5829
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
626443cfc2
|
根据客户id 获取预警配置
|
4 years ago |
|
jianjun
|
1d388f9f22
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
e533ca02da
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
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 |
|
jianjun
|
311acefdeb
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
b5b8728333
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
fdd7b17952
|
Merge branch 'dev_bugfix_ljj' into develop
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
|
4 years ago |
|
zhaoqifeng
|
d0ef6d9a65
|
下级组织的治理指数修改
|
4 years ago |
|
lzh
|
a0caaa96e1
|
更新时去掉设置customerId
|
4 years ago |
|
lzh
|
08e84a5b4f
|
配置类别列表过滤
|
4 years ago |
|
jianjun
|
983f86406c
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
jianjun
|
cc09d45fe5
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
848dd1be5c
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
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
|
d387cdf4be
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
3e73458b7d
|
房屋查询党员放在最前面
|
4 years ago |
|
zhaoqifeng
|
b0025889d2
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
zhaoqifeng
|
ef755fd152
|
房屋查询党员放在最前面
|
4 years ago |
wangxianzhang
|
9446a53b3a
|
修改：
ResultDataResolver.java，方法增加showMessage参数
|
4 years ago |
yinzuomei
|
4cc4eadcfc
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
yinzuomei
|
f4e872c357
|
居民需求分类管理
|
4 years ago |
sunyuchao
|
4966fc2ef6
|
社会组织CRUD
|
4 years ago |
|
zxc
|
a863f7f0f4
|
em
|
4 years ago |
|
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
|
067496c176
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
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
|
17cd5a34c3
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
