sunyuchao
|
cffbb48e23
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
sunyuchao
|
8a9d6e1909
|
旧接口程序完善
|
5 years ago |
zxc
|
de55c79642
|
徽章排序修改，提交审核添加校验
|
5 years ago |
|
zxc
|
4c9f872ecf
|
徽章修改
|
5 years ago |
wangchao
|
4e117ec2d0
|
居民端显示用户徽章，如果用户是点亮状态，但是客户的徽章被下线，缓存中不会出现此徽章，但是数据库中依然存在，且是点亮状态。
|
5 years ago |
|
zxc
|
0a40ab2088
|
徽章修改
|
5 years ago |
jianjun
|
757c10d568
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_personal_center
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
# 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/group/controller/ResiGroupController.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
# epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
5 years ago |
|
zxc
|
2f034a045c
|
我发起的议题表决中 url修改
|
5 years ago |
wxz
|
d95d31f073
|
恢复x文件
|
5 years ago |
|
wxz
|
1a162a1623
|
删除x文件
|
5 years ago |
|
wxz
|
2c7e78572d
|
加个空格
|
5 years ago |
|
wxz
|
ee233c81e9
|
Merge branch 'dev_group_edit' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
|
5 years ago |
|
zxc
|
01a42497c3
|
用户徽章缓存修改
|
5 years ago |
|
jianjun
|
5311a12228
|
日志添加参数
|
5 years ago |
|
sunyuchao
|
896c9fd3f3
|
Merge branch 'dev_wx_msg' into dev
|
5 years ago |
liushaowen
|
873faa606f
|
下调发送订阅的错误日志级别
|
5 years ago |
|
zxc
|
aad2545c73
|
徽章修改
|
5 years ago |
|
zxc
|
7608d28957
|
徽章修改
|
5 years ago |
yinzuomei
|
d037b228fc
|
居民端话题详情接口修改，添加屏蔽信息,屏蔽理由前面拼接 "话题已屏蔽："
|
5 years ago |
|
liushaowen
|
1d189ffee7
|
Merge branch 'dev_personal_center' of http://121.42.41.42:7070/r/epmet-cloud into dev_personal_center
|
5 years ago |
|
liushaowen
|
5127b22ce8
|
提交建议bug修复
|
5 years ago |
zhaoqifeng
|
d5338acbf9
|
徽章待审核列表修改
|
5 years ago |
|
yinzuomei
|
bfcdad9b52
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
yinzuomei
|
5606599f11
|
个人中心-我参与的话题去除已屏蔽的话题，修改selectParticipatedTopics sql 漏了个.
|
5 years ago |
|
zxc
|
15534db33b
|
徽章修改
|
5 years ago |
|
yinzuomei
|
67eb7ef1f6
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
yinzuomei
|
05fe810ed0
|
居民端话题详情接口修改，添加屏蔽信息
|
5 years ago |
|
zxc
|
619e1cbde4
|
徽章修改
|
5 years ago |
|
zhaoqifeng
|
1a79180b2c
|
徽章删除问题修改，徽章列表添加type字段
|
5 years ago |
|
yinzuomei
|
cbb074fb02
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
yinzuomei
|
c03523e066
|
个人中心-我参与的话题去除已屏蔽的话题，修改selectParticipatedTopics sql
|
5 years ago |
|
zxc
|
87f4e904b0
|
徽章修改
|
5 years ago |
|
zxc
|
1ab9eecc7a
|
徽章修改
|
5 years ago |
|
zxc
|
5d16a38417
|
徽章修改
|
5 years ago |
|
zhaoqifeng
|
9369314986
|
居民端头像从user_base_info获取
|
5 years ago |
|
liushaowen
|
51738f72db
|
建议bug修复
|
5 years ago |
|
zxc
|
675cf6bd92
|
徽章修改
|
5 years ago |
|
jianjun
|
6a8c6e4cb8
|
徽章添加 初始化脚本 调整字段长度
|
5 years ago |
|
jianjun
|
39c86ad1f2
|
徽章添加 初始化脚本 调整字段长度
|
5 years ago |
|
jianjun
|
4489d35f94
|
徽章添加 初始化脚本
|
5 years ago |
|
zhaoqifeng
|
e0fc623acd
|
居民端头像从user_base_info获取
|
5 years ago |
|
zxc
|
be4c32f755
|
徽章修改
|
5 years ago |
|
zxc
|
96d4a01c80
|
徽章修改
|
5 years ago |
|
zxc
|
473342fd54
|
徽章修改
|
5 years ago |
|
jianjun
|
d108faaf98
|
徽章添加 排序
|
5 years ago |
|
jianjun
|
69e9bffe47
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
jianjun
|
c089cb9379
|
"党员认证通过后参数校验"
|
5 years ago |
|
zhaoqifeng
|
23cd7d3873
|
徽章审核通过消息
|
5 years ago |
|
zxc
|
504dc19e81
|
调用feign接口修改
|
5 years ago |
|
liushaowen
|
827f1c79df
|
Merge branch 'dev_personal_center' of http://121.42.41.42:7070/r/epmet-cloud into dev_personal_center
|
5 years ago |
