wangchao
|
97706e0a17
|
抽取到大屏-难点赌点、热心市民，兼容因为删除网格而造成垃圾数据的情况
|
5 years ago |
sunyuchao
|
c8e9a8a3a4
|
bug修改
|
5 years ago |
|
sunyuchao
|
b042093523
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
4b4a3f68d9
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
b7753e0272
|
bug修改，feginclient多添加url问题
|
5 years ago |
|
sunyuchao
|
57cf9ddb49
|
接口调整
|
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 |
|
liushaowen
|
4375cfee2a
|
Merge branch 'dev_temp' of http://121.42.41.42:7070/r/epmet-cloud 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 |
|
liushaowen
|
890fe59224
|
Merge branch 'dev_group_code' 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
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
|
5 years ago |
|
liushaowen
|
580c1613a2
|
bug修复
|
5 years ago |
|
zxc
|
045706d25e
|
添加issueID
|
5 years ago |
|
liushaowen
|
3764e06913
|
群二维码flyway
|
5 years ago |
|
liushaowen
|
b29de0a60d
|
补充
|
5 years ago |
|
liushaowen
|
00a8494f89
|
群二维码
|
5 years ago |
|
liushaowen
|
b4c1f12b5e
|
群组二维码
|
5 years ago |
|
yinzuomei
|
9fe9183eae
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
f6b6e86921
|
log级别修改
|
5 years ago |
|
yinzuomei
|
ff092c9d71
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
yinzuomei
|
ce64aba21f
|
我发起的议题-已转项目，新增返参issueId
|
5 years ago |
|
wxz
|
e4546f58a6
|
Merge branch 'dev_group_edit' into dev_temp
|
5 years ago |
|
wxz
|
cd6f50a9de
|
修改:提交组信息编辑的时候，判断当前编辑人是否是组长，只有组长才允许编辑
|
5 years ago |
|
wxz
|
9984a549b0
|
Merge branch 'dev_exception_handle' into dev_group_edit
|
5 years ago |
|
wxz
|
67c3bc6d14
|
Merge branch 'dev_personal_center' into dev_temp
|
5 years ago |
|
wxz
|
683dc95e91
|
修改，使用新的异常抛出构造方法
|
5 years ago |
