zxc
|
a30b34f994
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit
# Conflicts:
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
|
5 years ago |
|
zxc
|
e559914843
|
Merge remote-tracking branch 'origin/dev_issue_audit' 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-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
# epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.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/java/com/epmet/service/IssueService.java
# epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
# epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
# 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 |
yinzuomei
|
83ab07aeae
|
居民端议题审核相关：待审核||已驳回 申请列表
|
5 years ago |
zhaoqifeng
|
6098ca0257
|
运营端-客户高级配置
|
5 years ago |
|
yinzuomei
|
e5c99f46aa
|
Merge remote-tracking branch 'origin/dev' into dev_issue_audit
|
5 years ago |
|
yinzuomei
|
b3341fb798
|
居民端-对议题发表建议-建议列表查询
|
5 years ago |
wxz
|
7b27044013
|
Merge branch 'dev_govaccess_async' into dev
|
5 years ago |
|
wxz
|
858e1b58c9
|
修改：调整权限批量添加，api和方法名称调整
|
5 years ago |
|
yinzuomei
|
56c871faad
|
居民端-对议题发表建议
|
5 years ago |
|
wxz
|
99ea55660c
|
新增：将默认权限同步到所有客户的指定角色的接口
|
5 years ago |
|
yinzuomei
|
53dbc537b5
|
居民端/resi/hall/issue/detail 接口修改新增返参对议题的建议/意见
|
5 years ago |
jianjun
|
3dd2d2899a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
jianjun
|
016ed7793c
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev
|
5 years ago |
|
wxz
|
be43fe97aa
|
Merge branch 'dev_common' into dev
|
5 years ago |
|
yinzuomei
|
796cc157c7
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
yinzuomei
|
6dab1ffef0
|
修改user服务/userresiinfo/getuserresiinfo接口
|
5 years ago |
|
zhaoqifeng
|
ffe06cfb0b
|
小组议题-全部议题
|
5 years ago |
wangchao
|
af4c0091ed
|
难点赌点 修正时间
|
5 years ago |
|
jianjun
|
122c8cebcc
|
job feign接口日志配置
|
5 years ago |
|
wangchao
|
7f44a2d45c
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
wangchao
|
f709bedaf5
|
难点赌点 全删全增
|
5 years ago |
|
zhaoqifeng
|
d414d962b9
|
小组议题-全部议题
|
5 years ago |
|
jianjun
|
bffe8dc539
|
暂时废弃 初始化多appId的方式代码
|
5 years ago |
|
wxz
|
cac28f16de
|
Merge branch 'dev_gateway_whitelist' into dev
|
5 years ago |
|
jianjun
|
52b0eaea1b
|
服务统一添加 错误告警
|
5 years ago |
|
yinzuomei
|
78b576a6ae
|
工作端-议题审核新增权限key
|
5 years ago |
|
zxc
|
03c8c5a1bb
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_issue_audit
|
5 years ago |
|
jianjun
|
97f4d46372
|
调用feign接口失败 返回错误，创建议题失败
|
5 years ago |
|
jianjun
|
252e4f76b2
|
httpclientManger 调整超时时间
|
5 years ago |
|
wangchao
|
b1ac7b1fde
|
我参与的话题，网格名称
|
5 years ago |
|
yinzuomei
|
975e5852b6
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit
|
5 years ago |
|
yinzuomei
|
140df61186
|
修改apply_status:under_auditing:待审核；approved:审核通过；rejected:驳回；
|
5 years ago |
|
zxc
|
041486c09c
|
议题审核
|
5 years ago |
|
wangchao
|
203cfd864a
|
抽取到大屏-难点赌点、热心市民，小组原始数据，兼容因为删除网格而造成垃圾数据的情况
|
5 years ago |
|
zhaoqifeng
|
f7320050f8
|
生成小组议题相关文件
|
5 years ago |
sunyuchao
|
6d6f4b6c9d
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
zxc
|
df3ce271b6
|
issue新提交
|
5 years ago |
|
jianjun
|
dd9fadda9c
|
httpclientManger 提取常量；调整超时时间为3-》4秒
|
5 years ago |
|
jianjun
|
ea4045b37e
|
修改 项目原始数据抽取 删除数据提出
|
5 years ago |
|
jianjun
|
0b4375f87c
|
修改 项目原始数据抽取 删除数据提出
|
5 years ago |
|
wangchao
|
f25e1b65b0
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
wangchao
|
97706e0a17
|
抽取到大屏-难点赌点、热心市民，兼容因为删除网格而造成垃圾数据的情况
|
5 years ago |
|
sunyuchao
|
4b4a3f68d9
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
b7753e0272
|
bug修改，feginclient多添加url问题
|
5 years ago |
|
zxc
|
7193932aa0
|
添加issueID
|
5 years ago |
|
yinzuomei
|
8705824e0c
|
网格id去重
|
5 years ago |
|
jianjun
|
851bc4f3d7
|
日抽取添加 使用线程池异步方法
|
5 years ago |
|
jianjun
|
64954f43de
|
日抽取添加 异步方法
|
5 years ago |
|
jianjun
|
ce4d6e4f91
|
得分写入失败打印异常
|
5 years ago |
|
wangchao
|
794f8b2ee4
|
小组话题查询 徽章信息 先查缓存 缓存没有再调用user服务
|
5 years ago |
