wxz
|
2cb0b4d102
|
Merge branch 'dev_oss_fix' into dev_temp
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java
|
5 years ago |
|
wxz
|
4997d80e9a
|
修改，解决oss-client影响服务调用的问题
|
5 years ago |
jianjun
|
df0b92a477
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
|
5 years ago |
|
jianjun
|
97f4d46372
|
调用feign接口失败 返回错误，创建议题失败
|
5 years ago |
wangchao
|
d41fabda76
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
wangchao
|
503d9e547e
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
jianjun
|
4079daeb11
|
Merge remote-tracking branch 'remotes/origin/dev_common' into dev_temp
|
5 years ago |
|
jianjun
|
252e4f76b2
|
httpclientManger 调整超时时间
|
5 years ago |
|
wangchao
|
b1ac7b1fde
|
我参与的话题，网格名称
|
5 years ago |
|
wangchao
|
1c5e321e06
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
|
wangchao
|
203cfd864a
|
抽取到大屏-难点赌点、热心市民，小组原始数据，兼容因为删除网格而造成垃圾数据的情况
|
5 years ago |
sunyuchao
|
6d6f4b6c9d
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
jianjun
|
1fd26a8c59
|
Merge remote-tracking branch 'remotes/origin/dev_common' into dev_temp
|
5 years ago |
|
jianjun
|
dd9fadda9c
|
httpclientManger 提取常量；调整超时时间为3-》4秒
|
5 years ago |
|
jianjun
|
48042b49cd
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp
|
5 years ago |
|
jianjun
|
ea4045b37e
|
修改 项目原始数据抽取 删除数据提出
|
5 years ago |
|
jianjun
|
a61142656e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp
|
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
|
25a54c5a3d
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
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
|
be9fb8a1d4
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
7193932aa0
|
添加issueID
|
5 years ago |
yinzuomei
|
8705824e0c
|
网格id去重
|
5 years ago |
|
jianjun
|
143dc94d44
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp
|
5 years ago |
|
jianjun
|
851bc4f3d7
|
日抽取添加 使用线程池异步方法
|
5 years ago |
|
sunyuchao
|
607405a661
|
Merge branch 'dev_group_code' into dev_temp
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java
# 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 |
|
jianjun
|
305bc368fb
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp
|
5 years ago |
|
jianjun
|
64954f43de
|
日抽取添加 异步方法
|
5 years ago |
|
jianjun
|
8a07514ba3
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp
|
5 years ago |
|
jianjun
|
ce4d6e4f91
|
得分写入失败打印异常
|
5 years ago |
|
sunyuchao
|
3c50b64f16
|
居民端、工作端获取海报、小组码基本信息
|
5 years ago |
|
wangchao
|
794f8b2ee4
|
小组话题查询 徽章信息 先查缓存 缓存没有再调用user服务
|
5 years ago |
liushaowen
|
0dabf68317
|
二维码oss
|
5 years ago |
|
jianjun
|
24a37bee7c
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp
|
5 years ago |
|
jianjun
|
cc54476df0
|
得分写入失败打印异常
|
5 years ago |
|
liushaowen
|
8741e77048
|
二维码上传
|
5 years ago |
|
jianjun
|
3f6a816343
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_temp
|
5 years ago |
|
jianjun
|
1f495c3d9f
|
公众参与解决 dimGrid 维度不存在时的情况兼容
|
5 years ago |
|
wangchao
|
883b70b40e
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
wangchao
|
2f9dcb4797
|
个人中心 我参与的话题 增加组Id返参
|
5 years ago |
|
wangchao
|
b3f46d291e
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
|
wangchao
|
55df7c1e77
|
小组原始数据抽取，如果维度-网格没有网格数据，以维度-网格数据为主，没有删除的组数据会被移除
|
5 years ago |
|
liushaowen
|
0eb2e6417e
|
oss
|
5 years ago |
|
liushaowen
|
810c6bba67
|
oss
|
5 years ago |
|
liushaowen
|
0c45e99fb8
|
oss
|
5 years ago |
|
wxz
|
6bfe1b29db
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
wxz
|
16d5c43316
|
修改：我发表的话题-已转议题，我发表的话题-已转项目修改，增加议题id，用于前端跳转到详情
|
5 years ago |
