zhaoqifeng
|
b7313ba0d2
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
90873a38bd
|
下级组织的治理指数修改
|
4 years ago |
|
zhaoqifeng
|
45419d0993
|
联建单位和活动相关接口
|
4 years ago |
yinzuomei
|
821cd69b35
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
|
4 years ago |
|
yinzuomei
|
c322e56b04
|
test
|
4 years ago |
jianjun
|
69b8df13dd
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
zxc
|
238d5d253b
|
时间段
|
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
|
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 |
|
zxc
|
fe4897944e
|
预约+列表
|
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 |
|
yinzuomei
|
ab85110bb3
|
保存需求
|
4 years ago |
|
jianjun
|
b5b8728333
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
|
zxc
|
f8a1d8f219
|
del
|
4 years ago |
|
zxc
|
3eab228fd6
|
del
|
4 years ago |
|
zxc
|
e92ed449e5
|
errorcode
|
4 years ago |
|
yinzuomei
|
89d0d24f05
|
改个地址
|
4 years ago |
|
zhaoqifeng
|
1f91bca284
|
data-aggregator升级
|
4 years ago |
|
zhaoqifeng
|
8fd25c08a5
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
de2f4f0c67
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
8fd121d734
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
|
4 years ago |
|
yinzuomei
|
e777635ea7
|
需求人列表
|
4 years ago |
|
zxc
|
51876107d4
|
edit
|
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 |
|
yinzuomei
|
3bf202d4b1
|
Merge branches 'dev_ic_platform' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_v2
|
4 years ago |
|
zxc
|
7e50856ea7
|
党群服务新增
|
4 years ago |
|
yinzuomei
|
76754262f6
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
|
4 years ago |
|
yinzuomei
|
1759dbb674
|
指派服务列表
|
4 years ago |
|
zxc
|
eede974beb
|
errorCode添加
|
4 years ago |
|
zxc
|
19a32e59e5
|
备注一下子
|
4 years ago |
lzh
|
a0caaa96e1
|
更新时去掉设置customerId
|
4 years ago |
|
lzh
|
08e84a5b4f
|
配置类别列表过滤
|
4 years ago |
|
jianjun
|
848dd1be5c
|
Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop
|
4 years ago |
|
jianjun
|
f96d48a3bf
|
分类预警配置 错误信息修改
|
4 years ago |
|
zhaoqifeng
|
01d096f5d0
|
联建单位和活动相关接口
|
4 years ago |
|
yinzuomei
|
2c0cde139a
|
社区自组织列表
|
4 years ago |
|
jianjun
|
e68ca8a448
|
改了个名
|
4 years ago |
|
yinzuomei
|
831b4e78de
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
|
4 years ago |
|
yinzuomei
|
821383e3f6
|
社区自组织列表
|
4 years ago |
|
zxc
|
2acf90aade
|
emm
|
4 years ago |
sunyuchao
|
347a74bffa
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
|
4 years ago |
|
sunyuchao
|
ef7d22175d
|
统一修改表名
|
4 years ago |
|
jianjun
|
dec8498fe0
|
代码调整
|
4 years ago |
|
yinzuomei
|
a3d7835d1f
|
社会组织列表
|
4 years ago |
|
jianjun
|
81a8faaaf3
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
