sunyuchao
|
b69d6e3a51
|
user库staff_wechat表添加字段
|
5 years ago |
zxc
|
eb51561ef2
|
社区
|
5 years ago |
yinzuomei
|
b99eac931b
|
区直部门-治理能力修改end1
|
5 years ago |
|
yinzuomei
|
5a7c25a69a
|
网格相关，分值计算修改end1
|
5 years ago |
|
yinzuomei
|
0a84c7e0f7
|
党员相关-党建能力分数计算修改end1
|
5 years ago |
|
yinzuomei
|
4ff8195339
|
指标计算入口，入参CalculateCommonFormDTO统一添加customerAreaCode、subCustomerIds: processPenddingCalculate
|
5 years ago |
|
yinzuomei
|
145d8073d5
|
指标计算入口，入参CalculateCommonFormDTO统一添加customerAreaCode、subCustomerIds
|
5 years ago |
|
yinzuomei
|
5e1bdd35a3
|
五级指标表，新增分子、分母那些列改为decimal(14,6)
|
5 years ago |
|
yinzuomei
|
dde4d387e9
|
五级指标表，新增分子、分母那些列默认值设0
|
5 years ago |
|
yinzuomei
|
96794a182d
|
Merge remote-tracking branch 'origin/dev_areaCode' into dev_temp
|
5 years ago |
|
yinzuomei
|
fb07d8caa9
|
statis新增问题记录
|
5 years ago |
|
yinzuomei
|
c1c20ea005
|
dim_customer增加列area_code、screen_customer_agency/dept/grid增加列up_to_cal、新增customer_relation表
|
5 years ago |
|
sunyuchao
|
99939d86f7
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
sunyuchao
|
1c6f8620a9
|
"代小程序管理"页面数据排序调整
|
5 years ago |
|
zxc
|
5c5d610f38
|
dimCustomer初始化添加areaCode
|
5 years ago |
|
yinzuomei
|
8b6aec63ae
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev_areaCode
|
5 years ago |
|
yinzuomei
|
3e4fe9463a
|
Merge remote-tracking branch 'origin/dev_voice_scan' into dev
|
5 years ago |
|
yinzuomei
|
6363f4997f
|
Merge remote-tracking branch 'origin/dev_voice_scan' into dev_temp
|
5 years ago |
|
yinzuomei
|
e3ea5b86b7
|
Merge remote-tracking branch 'origin/dev_reg_party_bugfix' into 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 |
wangchao
|
d860857fcd
|
Merge remote-tracking branch 'origin/dev_reg_party_bugfix' into dev_temp
|
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
|
812116e5bd
|
Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev
|
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 |
|
wangchao
|
1630085a52
|
在抽取难点赌点时不能因为没有图片或内容将其忽略。
|
5 years ago |
|
liushaowen
|
b1eda93a4c
|
Merge branch 'dev_mess_party' into dev_temp
|
5 years ago |
|
liushaowen
|
4b264791e2
|
订阅消息
|
5 years ago |
|
wangchao
|
ab75c460cc
|
项目抽取原始数据时对删除的项目进行清除
|
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 |
