yinzuomei
|
ee2bc6359f
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
20ce4d5548
|
群链接日志降级warn
|
5 years ago |
wxz
|
4ff19ade7e
|
【版本升级】gov-issue
|
5 years ago |
|
wxz
|
45dba7f2ac
|
Merge branch 'dev'
|
5 years ago |
zxc
|
261c05104c
|
issue-process
|
5 years ago |
|
wxz
|
2be4cf270a
|
mq初始化客户
版本升级
|
5 years ago |
|
wxz
|
526eebc660
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
edd0c3760d
|
Merge branch 'dev_mq_init_customer' into dev
# 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
|
e8e885c02e
|
删除错误提交的SSOLoginController
|
5 years ago |
zhaoqifeng
|
a859518545
|
third服务升级 代码上传
|
5 years ago |
|
zhaoqifeng
|
6fa63ecd54
|
Merge branch 'dev'
|
5 years ago |
|
zhaoqifeng
|
123d9f2ee1
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
90e7ea00fa
|
代码上传
|
5 years ago |
|
zhaoqifeng
|
aa73c5ff9d
|
third服务升级 代码上传
|
5 years ago |
|
zhaoqifeng
|
9da8e39497
|
Merge branch 'dev'
|
5 years ago |
|
zhaoqifeng
|
1d76c7b500
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
e0af1884fa
|
代码上传
|
5 years ago |
|
wxz
|
23efd3a65c
|
新增系统消息表
|
5 years ago |
|
zhaoqifeng
|
0a8e4a903c
|
third服务升级 pa_customer表添加type字段
|
5 years ago |
|
zhaoqifeng
|
93cd73433a
|
Merge branch 'dev'
|
5 years ago |
|
zhaoqifeng
|
16b4d0fcd5
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
4b7ab53d2e
|
pa_customer表添加type字段
|
5 years ago |
|
zhaoqifeng
|
a99daf737b
|
pa_customer表添加type字段
|
5 years ago |
|
zhaoqifeng
|
2675f80290
|
pa_customer表添加type字段
|
5 years ago |
|
yinzuomei
|
4aded4d287
|
地区编码查询接口修改，服务升级
|
5 years ago |
|
yinzuomei
|
23153174f4
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
436889cc47
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev
|
5 years ago |
|
zxc
|
f6b40bb7bf
|
tree
|
5 years ago |
sunyuchao
|
f505885315
|
重发三个服务
|
5 years ago |
|
sunyuchao
|
fba2fba3df
|
"代小程序管理"页面数据排序调整
|
5 years ago |
|
sunyuchao
|
be0110843b
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
99939d86f7
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
sunyuchao
|
1c6f8620a9
|
"代小程序管理"页面数据排序调整
|
5 years ago |
|
yinzuomei
|
41cdefec8f
|
open-api+1
|
5 years ago |
|
yinzuomei
|
1e87036c6f
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
3e4fe9463a
|
Merge remote-tracking branch 'origin/dev_voice_scan' into dev
|
5 years ago |
|
yinzuomei
|
a39762b14f
|
#bug1831:工作端-党员审核bug 发布resi-party，user
|
5 years ago |
|
yinzuomei
|
45684fbef4
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
e3ea5b86b7
|
Merge remote-tracking branch 'origin/dev_reg_party_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
61dd8c4146
|
发短信方法调整
|
5 years ago |
|
sunyuchao
|
a2d27378c5
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
6ba59779bc
|
Merge branch 'dev_mess_party' into dev
|
5 years ago |
|
zxc
|
1708336fa2
|
短信发送
|
5 years ago |
|
wxz
|
24e998fc07
|
修复：pom->prod环境的active错误的配置成了test
|
5 years ago |
|
sunyuchao
|
73f4cc75cd
|
订阅消息、身边党员、短信功能发布生产
|
5 years ago |
|
sunyuchao
|
4292c5a573
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
7e6f5e2c28
|
Merge branch 'dev_mess_party' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
|
5 years ago |
wangchao
|
730b892023
|
注册党员的bug修复①数据之间有依赖，调整逻辑执行的顺序，先生成用户缓存数据，再根据缓存里的注册网格Id进行初始化党员徽章②在检查用户是否是认证居民时，主表使用的baseInfo，左关联resiInfo，当baseInfo有值而resiInfo为空时会查出数据，被认为已经注册居民，但是此时用户并未生成注册居民的一系列数据，用户触发更新微信信息的接口时会初始化上baseInfo，改成内关联，只有当两边都有值时才能认定用户已经注册。
|
5 years ago |
|
yinzuomei
|
07e18d1e97
|
难点赌点数据抽取、project原始指标数据抽取，发布
|
5 years ago |
|
yinzuomei
|
e9b9164cf7
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
