sunyuchao
|
a61c5f4442
|
user库添加客户Id字段
|
5 years ago |
zxc
|
c8500ba129
|
gov-project库，不存在customerId的表，添加字段，对应DTO和Entity修改
|
5 years ago |
|
zxc
|
4e11250575
|
gov-issue库，不存在customerId的表，添加字段，对应DTO和Entity修改
|
5 years ago |
|
sunyuchao
|
9961a4f9a8
|
message库添加客户Id字段
|
5 years ago |
|
sunyuchao
|
ee64fe1f5a
|
Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_add_customer_id
|
5 years ago |
|
sunyuchao
|
fe93055760
|
oss库添加客户Id字段
|
5 years ago |
|
zxc
|
ad4a86da21
|
resi-group库，不存在customerId的表，添加字段，对应DTO和Entity修改
|
5 years ago |
|
sunyuchao
|
c719e8c6fe
|
Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_add_customer_id
|
5 years ago |
|
sunyuchao
|
6eef4c0d7a
|
resi_partymember库添加客户Id字段
|
5 years ago |
|
zxc
|
551cc7e6d5
|
resi-group库，不存在customerId的表，添加字段，对应DTO和Entity修改
|
5 years ago |
|
sunyuchao
|
5fdf6126c3
|
陌生人导览库添加字段
|
5 years ago |
|
sunyuchao
|
eae6cd44e2
|
解决冲突 entity添加注解
|
5 years ago |
|
sunyuchao
|
a1c3b79edb
|
解决冲突
|
5 years ago |
wangchao
|
bb06e23d29
|
Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_add_customer_id
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java
|
5 years ago |
|
sunyuchao
|
c66e9a6b1e
|
role_operation、role_scope、customer_home_detail、project_org_relation、project_related_personnel、staff_wechat、user、staff_role、user_wechat 添加客户ID 对应sql脚本还未提交
|
5 years ago |
yinzuomei
|
436889cc47
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev
|
5 years ago |
|
wangchao
|
90106a8d2d
|
Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_add_customer_id
|
5 years ago |
|
wangchao
|
52c220ec25
|
EPMET_USER库中，user表、staff_role表添加【客户Id】字段
|
5 years ago |
|
zxc
|
f6b40bb7bf
|
tree
|
5 years ago |
zhaoqifeng
|
2f11a76d52
|
表添加customerId
|
5 years ago |
|
sunyuchao
|
36395356b6
|
工作端登陆模块接口调整
|
5 years ago |
|
zhaoqifeng
|
b0107f0e54
|
表添加customerId
|
5 years ago |
|
sunyuchao
|
b69d6e3a51
|
user库staff_wechat表添加字段
|
5 years ago |
|
sunyuchao
|
99939d86f7
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
sunyuchao
|
1c6f8620a9
|
"代小程序管理"页面数据排序调整
|
5 years ago |
|
yinzuomei
|
3e4fe9463a
|
Merge remote-tracking branch 'origin/dev_voice_scan' into dev
|
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 |
|
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
|
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
|
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
|
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
|
e4eef1c2b0
|
订阅消息bug
|
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
|
427534500c
|
话题转议题订阅
|
5 years ago |
