zxc
|
a94a05265a
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
yinzuomei
|
be9f235bd1
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
85a2d4015a
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
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
|
ad88141b2a
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
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
|
045bd0c88f
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
619e1cbde4
|
徽章修改
|
5 years ago |
zhaoqifeng
|
d4c6fbf2a5
|
Merge branch 'dev_personal_center' into dev_temp
|
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
|
6036d86e01
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
87f4e904b0
|
徽章修改
|
5 years ago |
|
zxc
|
f39fb3449d
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
1ab9eecc7a
|
徽章修改
|
5 years ago |
|
zxc
|
99f7726b1f
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
5d16a38417
|
徽章修改
|
5 years ago |
|
zhaoqifeng
|
e275b61f00
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
9369314986
|
居民端头像从user_base_info获取
|
5 years ago |
|
yinzuomei
|
d2904296e5
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
yinzuomei
|
133db38da4
|
selectListByIssueApplicationId sql修改
|
5 years ago |
liushaowen
|
1c03d910ff
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
liushaowen
|
51738f72db
|
建议bug修复
|
5 years ago |
|
yinzuomei
|
c38dc8b867
|
工作端议题审核，待审核+已驳回接口拆分为2个。v2
|
5 years ago |
|
zxc
|
1431da6a68
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
675cf6bd92
|
徽章修改
|
5 years ago |
jianjun
|
6a8c6e4cb8
|
徽章添加 初始化脚本 调整字段长度
|
5 years ago |
|
yinzuomei
|
c899840b0a
|
工作端议题审核，待审核+已驳回接口拆分为2个。
|
5 years ago |
|
jianjun
|
39c86ad1f2
|
徽章添加 初始化脚本 调整字段长度
|
5 years ago |
|
jianjun
|
4489d35f94
|
徽章添加 初始化脚本
|
5 years ago |
|
zhaoqifeng
|
e0fc623acd
|
居民端头像从user_base_info获取
|
5 years ago |
|
zxc
|
5d41c5c503
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
zxc
|
ae1bf616ec
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
yinzuomei
|
10cd3d674a
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
zxc
|
be4c32f755
|
徽章修改
|
5 years ago |
|
yinzuomei
|
fa8755909a
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit
|
5 years ago |
|
yinzuomei
|
e23fc068d8
|
修改resi/hall/issue/detail方法，新增返参attitude
|
5 years ago |
|
zxc
|
61022be3e9
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
96d4a01c80
|
徽章修改
|
5 years ago |
|
zhaoqifeng
|
f7dd854487
|
运营端-客户高级配置
|
5 years ago |
|
zxc
|
50ded670bb
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
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 |
|
yinzuomei
|
e32356b1e2
|
Merge remote-tracking branch 'origin/dev_group_code' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java
|
5 years ago |
