wangchao
|
d860857fcd
|
Merge remote-tracking branch 'origin/dev_reg_party_bugfix' into dev_temp
|
5 years ago |
|
wangchao
|
730b892023
|
注册党员的bug修复①数据之间有依赖，调整逻辑执行的顺序，先生成用户缓存数据，再根据缓存里的注册网格Id进行初始化党员徽章②在检查用户是否是认证居民时，主表使用的baseInfo，左关联resiInfo，当baseInfo有值而resiInfo为空时会查出数据，被认为已经注册居民，但是此时用户并未生成注册居民的一系列数据，用户触发更新微信信息的接口时会初始化上baseInfo，改成内关联，只有当两边都有值时才能认定用户已经注册。
|
5 years ago |
sunyuchao
|
098b8c2a08
|
Merge branch 'dev_voice_share_point' into dev
|
5 years ago |
liushaowen
|
3e76a795bb
|
Merge branch 'dev_mess_party' into dev_temp
|
5 years ago |
|
liushaowen
|
fcf8392f29
|
Merge branch 'dev_mess_party' of http://121.42.41.42:7070/r/epmet-cloud into dev_mess_party
|
5 years ago |
|
liushaowen
|
0c3557dff2
|
消息订阅
|
5 years ago |
|
sunyuchao
|
d229df1ab2
|
Merge branch 'dev_mess_party' into dev_temp
|
5 years ago |
|
sunyuchao
|
b853e612b5
|
Merge remote-tracking branch 'origin/dev_mess_party' into dev_mess_party
|
5 years ago |
|
sunyuchao
|
c0721ee399
|
身边党员积分排序sql调整，积分相同的排序一样
|
5 years ago |
|
liushaowen
|
b1eda93a4c
|
Merge branch 'dev_mess_party' into dev_temp
|
5 years ago |
|
liushaowen
|
4b264791e2
|
订阅消息
|
5 years ago |
yinzuomei
|
9329edb84c
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev
|
5 years ago |
|
liushaowen
|
73d4cc14c3
|
Merge branch 'dev_mess_party' into dev_temp
|
5 years ago |
|
liushaowen
|
e4eef1c2b0
|
订阅消息bug
|
5 years ago |
|
sunyuchao
|
c480dcb0f3
|
和代码解决冲突
|
5 years ago |
|
sunyuchao
|
92e9a7ed0a
|
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
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
|
5 years ago |
zhaoqifeng
|
3ae0384f3d
|
项目流转短信消息
|
5 years ago |
|
sunyuchao
|
637a71c93a
|
添加注释
|
5 years ago |
|
liushaowen
|
2d5d3cbb83
|
Merge branch 'dev_mess_party' of http://121.42.41.42:7070/r/epmet-cloud into dev_mess_party
# 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
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
|
5 years ago |
|
liushaowen
|
9a79d7efcc
|
话题转议题订阅bug
|
5 years ago |
|
zhaoqifeng
|
8f2ef22a58
|
项目流转短信消息
|
5 years ago |
|
zhaoqifeng
|
7f0b357d7e
|
Merge branches 'dev' and 'dev_mess_party' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_mess_party
# 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
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
|
5 years ago |
|
liushaowen
|
54505c2a4e
|
Merge branch 'dev_mess_party' into dev_temp
|
5 years ago |
|
liushaowen
|
427534500c
|
话题转议题订阅
|
5 years ago |
wxz
|
c333e5fd2d
|
Merge branch 'dev_mq_init_customer' into dev_temp
|
5 years ago |
|
wxz
|
e22fe2daca
|
修改：将"客户初始化为了测试方便，临时去掉设置业务域名的操作"恢复
|
5 years ago |
jianjun
|
50117711dc
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_screen' into dev_temp
|
5 years ago |
zxc
|
9fc0bcaeea
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev_temp
|
5 years ago |
|
zxc
|
65b9176e25
|
行政地区编码查询
|
5 years ago |
|
jianjun
|
d8d6ce91fd
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_screen' into dev
|
5 years ago |
|
jianjun
|
f2bb21bf51
|
大屏 先锋模范借口 添加 平台议事总数和但也占比返回
|
5 years ago |
|
wxz
|
25a328892e
|
Merge branch 'dev_mq_init_customer' into dev_temp
|
5 years ago |
|
yinzuomei
|
fb577c6121
|
Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev
|
5 years ago |
|
yinzuomei
|
9afd38a997
|
PLAT_JOIN_PARTY_RATIO 这个生产上已经发了
|
5 years ago |
|
wxz
|
fbbce97dcd
|
修改：客户初始化为了测试方便，临时去掉设置业务域名的操作
|
5 years ago |
|
yinzuomei
|
ab66158172
|
Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev
|
5 years ago |
|
yinzuomei
|
25fee5d681
|
platJoinPartyRatio 91
|
5 years ago |
|
yinzuomei
|
fd961acfe0
|
Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev
|
5 years ago |
|
yinzuomei
|
3e2f4729cd
|
platJoinPartyRatio
|
5 years ago |
|
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 |
|
yinzuomei
|
8a17ca5d20
|
Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev
|
5 years ago |
|
yinzuomei
|
d10962adcf
|
先锋模范抽取，增加各总数
|
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 |
