wxz
|
18a1a153b9
|
Merge branch 'dev_mq_init_customer' into dev_temp
# Conflicts:
# epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java
# epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java
# epmet-module/epmet-message/epmet-message-server/pom.xml
|
5 years ago |
|
wxz
|
0c30a7b1a5
|
Merge branches 'dev' and 'dev_mq_init_customer' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_mq_init_customer
Conflicts:
epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
epmet-user/epmet-user-server/pom.xml
epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
|
5 years ago |
|
wxz
|
51d073c81a
|
修改：将yml中rocketmq的配置放到pom中
|
5 years ago |
zhaoqifeng
|
19489d4930
|
Merge branch 'dev_voice_share_point' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
79a8116dac
|
话题自动审核修改
|
5 years ago |
wangchao
|
3a455c0e85
|
Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
|
5 years ago |
|
wangchao
|
01952a2161
|
给邀请用户入组、邀请新人入组、话题被转为项目修改事件描述
|
5 years ago |
|
zhaoqifeng
|
ad9be213f4
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
9d06394795
|
订阅消息修改
|
5 years ago |
|
zhaoqifeng
|
3d3168829f
|
订阅消息修改
|
5 years ago |
|
wangchao
|
94a24ac1da
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
wangchao
|
84d1df1f44
|
Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
|
5 years ago |
liushaowen
|
d460f23689
|
Merge branch 'dev_mess_party' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
|
5 years ago |
|
zhaoqifeng
|
7be30bb79b
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
wangchao
|
7beefc769f
|
给所有积分规则的上限描述统一描述flyway
|
5 years ago |
|
zhaoqifeng
|
230b9f2311
|
订阅消息修改
|
5 years ago |
|
liushaowen
|
9953217214
|
订阅消息bug
|
5 years ago |
|
wangchao
|
188629e94d
|
给所有积分规则的上限描述统一描述、通过链接入组的入群记录不管是自动通过还是审核通过，进群描述一样
|
5 years ago |
sunyuchao
|
8483f53205
|
Merge branch 'dev_mess_party' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
|
5 years ago |
yinzuomei
|
4db6b1bf2c
|
Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev
|
5 years ago |
|
yinzuomei
|
f03c5e0304
|
先锋模范抽取2
|
5 years ago |
|
yinzuomei
|
99fc51c9f8
|
Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev
|
5 years ago |
|
yinzuomei
|
d2a155906a
|
先锋模范抽取
|
5 years ago |
|
yinzuomei
|
119faf52d4
|
Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev
|
5 years ago |
|
yinzuomei
|
52c4766ac4
|
Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev_bugfix_screen
|
5 years ago |
|
yinzuomei
|
0c2bc1bbd4
|
PioneerDataExtractService添加日志
|
5 years ago |
|
liushaowen
|
66e1cf4dfd
|
话题转议题未发送订阅消息修复
|
5 years ago |
zxc
|
3cae6d4936
|
Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
|
5 years ago |
|
zxc
|
e216085dcc
|
议题分享
|
5 years ago |
|
wangchao
|
b95da501bd
|
Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev_bugfix_screen
|
5 years ago |
|
wangchao
|
af99db1002
|
小组数据抽取 bug修改
|
5 years ago |
|
zxc
|
11fcd347b5
|
基层党建-党员基本情况表党员总数修改
|
5 years ago |
|
sunyuchao
|
feebea78ff
|
Merge branch 'dev_mess_party' into dev_temp
|
5 years ago |
|
liushaowen
|
963ca28550
|
订阅消息bug
|
5 years ago |
|
sunyuchao
|
56f9a3c0fa
|
脚本调整
|
5 years ago |
|
wangchao
|
9acc689619
|
Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
|
5 years ago |
|
wangchao
|
79fadc6c22
|
入组申请的文案调整 flyway添加字段 issue库
|
5 years ago |
|
yinzuomei
|
27feebd2f9
|
Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev
|
5 years ago |
|
yinzuomei
|
ef720bffc0
|
治理能力榜单，返回parentAgencyName
|
5 years ago |
|
zhaoqifeng
|
9fadb0d831
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
65aadd0d4d
|
订阅消息修改
|
5 years ago |
|
zhaoqifeng
|
7dbe156fd8
|
订阅消息修改
|
5 years ago |
|
yinzuomei
|
51079b8ae9
|
screen_party_link_masses_data md
|
5 years ago |
jianjun
|
1ff9451da4
|
小组抽取打印日志
|
5 years ago |
|
zhaoqifeng
|
58eb35b339
|
Merge branch 'dev_voice_share_point' into dev_temp
|
5 years ago |
|
wangchao
|
e5cb9b2dca
|
大屏治理能力榜单添加上级组织名称返参
|
5 years ago |
|
zhaoqifeng
|
5566a9a137
|
话题列表，自动审核修改
|
5 years ago |
|
wangchao
|
81405590d5
|
Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
|
5 years ago |
|
wangchao
|
95a1ee5082
|
查询话题详情和图片时加上附件类型条件为image
|
5 years ago |
|
zhaoqifeng
|
026f230a4a
|
订阅消息修改
|
5 years ago |
