yinzuomei
|
0fc2502075
|
report,statis,+1
|
5 years ago |
|
yinzuomei
|
3841267263
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
be433248be
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
5 years ago |
|
yinzuomei
|
ca3d09ef98
|
修改用户分布查询接口
|
5 years ago |
|
yinzuomei
|
5e625c6e2d
|
selectDifficulty方法修改EVENT_CATEGORY_NAME为null返回''
|
5 years ago |
zxc
|
b6bc63bb2a
|
screen_cpc_base_data删除去除dateId
|
5 years ago |
wxz
|
423b48ff4f
|
版本升级
|
5 years ago |
|
wxz
|
c272db367e
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
790f49a43e
|
BaseLogAspect修改RenException的错误码判断，如果是>8000返回给用户的，就打印warn级别日志，不再报警给钉钉。如果<=8000则依旧打印error日志，报警给钉钉
|
5 years ago |
|
wxz
|
7e03009d97
|
版本升级
|
5 years ago |
|
wxz
|
ca6fd1cec0
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
b1f340d8f5
|
修复：【工作端权限】运营端取消了操作，但是没取消范围，工作端小程序依然具有该权限
|
5 years ago |
sunyuchao
|
f18bb25a97
|
同步用户微信信息接口调整优化头像为非必填字段
|
5 years ago |
|
sunyuchao
|
0aea19925e
|
Merge branch 'master' into dev
|
5 years ago |
|
sunyuchao
|
8546ef1aef
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
af817561af
|
同步用户微信信息接口调整优化头像为非必填字段
|
5 years ago |
|
zxc
|
43a1ee0777
|
bug修复
|
5 years ago |
|
sunyuchao
|
553bfd54cf
|
生产-同步消息模板bug修改
|
5 years ago |
|
sunyuchao
|
e090426d50
|
Merge branch 'dev'
|
5 years ago |
zhaoqifeng
|
1ee7d04719
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
2c8419f5de
|
消息订阅初始化修改
|
5 years ago |
|
zxc
|
edcd61b5e1
|
bug修复
|
5 years ago |
|
wxz
|
40424ca30d
|
版本升级
|
5 years ago |
|
yinzuomei
|
8d986e65d9
|
heart服务升级到56
|
5 years ago |
|
yinzuomei
|
c3d4ec3423
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
30ee0c8e97
|
居民端爱心榜heart/resi/act/leaderboard接口修改
|
5 years ago |
|
sunyuchao
|
d16987ba15
|
对外接口调整入参逻辑
|
5 years ago |
|
sunyuchao
|
514916eecc
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
c49a57f594
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
da6f09bf50
|
对外接口调整入参逻辑
|
5 years ago |
wangchao
|
db575c0ee1
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
5 years ago |
|
wangchao
|
cf7c47bee1
|
userStreetName(格式: XX路-X先生/女士)
|
5 years ago |
|
wxz
|
c70704336e
|
增加为单个角色，批量添加多个操作权限和操作范围的接口
|
5 years ago |
|
wangchao
|
87df18def3
|
进入网格(enterGrid)接口增加返参userStreetName(格式: XX路-X先生/女士)
|
5 years ago |
|
wxz
|
7d6362f19d
|
版本升级
|
5 years ago |
|
wxz
|
26ad189011
|
Merge branch 'dev'
|
5 years ago |
|
wangchao
|
1c91327b89
|
Merge remote-tracking branch 'origin/dev' into dev_issue_audit
|
5 years ago |
|
zhaoqifeng
|
81ec30d0c8
|
小组议题-全部议题修改
|
5 years ago |
|
sunyuchao
|
9b92449d62
|
bug修改，关于历史小组数据首次生成小组海报报错的问题
|
5 years ago |
|
wangchao
|
a31083a567
|
当议题申请第一次被拒绝后，第二次申请之前将议题开关关闭，二次申请后生成的两条申请历史1、under_auditing 2、auto_passed先后之间的createdTime要相差一秒，保证议题审核历史列表排序的正确性
|
5 years ago |
|
zxc
|
289f8d1336
|
审核历史倒叙
|
5 years ago |
|
wxz
|
4a99217a1a
|
版本升级
|
5 years ago |
|
wxz
|
8b35a67aef
|
版本升级
|
5 years ago |
|
wxz
|
971e0e5419
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
97f449250f
|
Merge branch 'dev_group_code' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.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/service/ResiGroupService.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 |
|
sunyuchao
|
b5764f292f
|
Merge branch 'dev_issue_audit' into dev
|
5 years ago |
|
sunyuchao
|
caad078975
|
小程序代码上传时同步更新两个小程序最新名称
|
5 years ago |
|
sunyuchao
|
1abfc072c9
|
Merge branch 'dev'
|
5 years ago |
|
zhaoqifeng
|
19d5220088
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
d88c2d2a36
|
上传代码时，更新小程序名
|
5 years ago |
