yinzuomei
|
bdc4867ec2
|
工作端待审核、已驳回添加权限校验注解
|
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
|
787c280b37
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
2f034a045c
|
我发起的议题表决中 url修改
|
5 years ago |
wangchao
|
acf87a36be
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
5 years ago |
|
wangchao
|
9f73be0db0
|
居民端话题转议题
|
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
|
1ad4ed82c6
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
01a42497c3
|
用户徽章缓存修改
|
5 years ago |
|
wangchao
|
1e4590dab6
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit
|
5 years ago |
|
wangchao
|
e063404c8e
|
议题审核
|
5 years ago |
|
zxc
|
cee30082bb
|
议题审核历史加权限
|
5 years ago |
|
zxc
|
8979c301d0
|
冲突修改
|
5 years ago |
|
zxc
|
4c35fd2226
|
Merge remote-tracking branch 'origin/dev_issue_audit' 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
|
5 years ago |
|
jianjun
|
8648d6126e
|
Merge remote-tracking branch 'remotes/origin/dev_personal_center' into dev_temp
|
5 years ago |
|
jianjun
|
5311a12228
|
日志添加参数
|
5 years ago |
|
zxc
|
61336b1998
|
议题审核详情，历史
|
5 years ago |
sunyuchao
|
23e333033f
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
sunyuchao
|
896c9fd3f3
|
Merge branch 'dev_wx_msg' into dev
|
5 years ago |
liushaowen
|
873faa606f
|
下调发送订阅的错误日志级别
|
5 years ago |
|
zxc
|
8dc7b33891
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
aad2545c73
|
徽章修改
|
5 years ago |
|
zxc
|
9beef5c6e9
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
7608d28957
|
徽章修改
|
5 years ago |
|
yinzuomei
|
98dd01de86
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
yinzuomei
|
d037b228fc
|
居民端话题详情接口修改，添加屏蔽信息,屏蔽理由前面拼接 "话题已屏蔽："
|
5 years ago |
|
liushaowen
|
cf64bb35be
|
Merge branch 'dev_personal_center' into dev_temp
|
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
|
255b9ccda7
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
d5338acbf9
|
徽章待审核列表修改
|
5 years ago |
|
yinzuomei
|
c747b5df8e
|
Merge remote-tracking branch 'origin/dev_group_code' into dev_temp
|
5 years ago |
|
yinzuomei
|
ee58f84e7b
|
申请加入小组日志级别修改
|
5 years ago |
|
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 |
