wangchao
|
3d38a2837a
|
修复二次提交议题
|
5 years ago |
zxc
|
5f483565ed
|
先生/女士 修改
|
5 years ago |
|
wangchao
|
79e4db6e26
|
二次提交时不新增application_history
|
5 years ago |
|
wangchao
|
fce9e5c236
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit
|
5 years ago |
|
zxc
|
9e085cc604
|
feign调用添加判断
|
5 years ago |
wxz
|
a9efa6e4d6
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
wxz
|
cd014fc47e
|
文案写错(已转项目写成已转议题)修改
|
5 years ago |
|
wangchao
|
a859a7a364
|
mybatis sql过滤器修改
|
5 years ago |
|
wangchao
|
99853fce36
|
openFeign修改
|
5 years ago |
|
wangchao
|
81c006e168
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit
# Conflicts:
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java
# epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml
# 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 |
|
wangchao
|
acd1cee757
|
议题审核
|
5 years ago |
|
zxc
|
0c9515018d
|
徽章修改
|
5 years ago |
yinzuomei
|
6235c4e920
|
个人中心-我发起的议题-审核中列表接口
|
5 years ago |
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 |
|
yinzuomei
|
3fc38ecffa
|
issue_application、issue_application_history 新增auto_passed:自动通过
|
5 years ago |
jianjun
|
9140cef871
|
修改合并错误
|
5 years ago |
|
jianjun
|
b2588abaee
|
Merge remote-tracking branch 'remotes/origin/dev_personal_center' into dev_issue_audit
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
# epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
# 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/dao/ResiGroupDao.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.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/ResiTopicServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.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
# epmet-user/epmet-user-server/pom.xml
# epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
|
5 years ago |
|
wangchao
|
4e117ec2d0
|
居民端显示用户徽章，如果用户是点亮状态，但是客户的徽章被下线，缓存中不会出现此徽章，但是数据库中依然存在，且是点亮状态。
|
5 years ago |
|
jianjun
|
dfeabf616c
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_group_code
# 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/pom.xml
# 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/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/java/com/epmet/modules/utils/ModuleConstant.java
# epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
# 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 |
|
yinzuomei
|
bbd6ac286d
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit
|
5 years ago |
|
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
|
2f034a045c
|
我发起的议题表决中 url修改
|
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
|
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 |
|
jianjun
|
5311a12228
|
日志添加参数
|
5 years ago |
|
zxc
|
61336b1998
|
议题审核详情，历史
|
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
|
ee58f84e7b
|
申请加入小组日志级别修改
|
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 |
