sunyuchao
|
5a127f90f9
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
sunyuchao
|
59780e83d0
|
公众号手机注册接口调整
|
5 years ago |
wxz
|
97c97299bf
|
resi_mine，增加app/footbars接口，用于获取footbar
|
5 years ago |
|
sunyuchao
|
ce8299bae7
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
yinzuomei
|
ab6a27dda1
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
yinzuomei
|
0d9d30ef15
|
heart-work:报名审核-人员历史活动情况api
|
5 years ago |
|
wxz
|
5f17ab0d81
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
wxz
|
7d20e068f6
|
Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
wxz
|
669306f6db
|
修改footbar查询，增加app_type,order字段，用于区分app，排序
|
5 years ago |
jianjun
|
6471044f6e
|
积分规则接口测试
|
5 years ago |
|
yinzuomei
|
0c966dcdd5
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml
|
5 years ago |
zxc
|
37726c95ec
|
epmet-third、auth服务升级
|
5 years ago |
|
yinzuomei
|
f05c44dd1f
|
heart-work:报名审核-详情api
|
5 years ago |
|
zxc
|
456bbf998d
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
08ee702eb3
|
微信第三方平台-刷新authorizer_access_token
|
5 years ago |
|
sunyuchao
|
4c3f675e1f
|
修改配置文件中工作端appid secret
|
5 years ago |
|
zxc
|
3b41c857b5
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev_thirdplatform
|
5 years ago |
|
zxc
|
b0e8c6724f
|
微信第三方平台-修改
|
5 years ago |
zhaoqifeng
|
84a292d10b
|
第三方代码上传
|
5 years ago |
|
wxz
|
cc3343c9e2
|
版本升级
|
5 years ago |
zhangyongzhangyong
|
1862b53271
|
用户接口：根据用户ID，查询用户所属角色
|
5 years ago |
|
wxz
|
47164c985c
|
修改用户信息修改接口，刷新redis权限，修复丢失root_manager的问题
版本升级
|
5 years ago |
|
zhangyongzhangyong
|
fb203f736c
|
爱心互助-居民端接口
|
5 years ago |
|
wxz
|
0d18cceefb
|
版本升级
|
5 years ago |
|
wxz
|
db5907c478
|
1.运营端添加客户，为客户设置管理员，此时设置的是root_manager跟管理员
2.工作端为工作人员配置角色时，不显示root_manager根管理员
|
5 years ago |
|
jianjun
|
05cac1ea4f
|
积分规则相关接口
|
5 years ago |
|
zhangyongzhangyong
|
f66bbc51a0
|
爱心互助-居民端
|
5 years ago |
|
zhaoqifeng
|
6cf3f8e869
|
第三方代码上传
|
5 years ago |
|
zhaoqifeng
|
0d3ed3aea5
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhaoqifeng
|
b46d0075aa
|
第三方代码上传
|
5 years ago |
|
zxc
|
70125cc303
|
epmet-third服务升级
|
5 years ago |
|
zxc
|
f48493eb7b
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
bd81d756da
|
微信第三方平台-authInfo的key修改
|
5 years ago |
|
zhaoqifeng
|
08a098fe1f
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
0dc1f889ab
|
第三方代码上传
|
5 years ago |
|
zhaoqifeng
|
25d61deee3
|
第三方代码上传
|
5 years ago |
|
zxc
|
49af760b84
|
epmet-third服务升级
|
5 years ago |
|
zxc
|
e130492d85
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
d4a7fed6d0
|
微信第三方平台-授权回调
|
5 years ago |
|
yinzuomei
|
27ae4b0a85
|
user误提
|
5 years ago |
|
yinzuomei
|
995837f5ab
|
heart-work:报名审核-概要统计v1
|
5 years ago |
|
zxc
|
66cbc1d796
|
epmet-third服务升级
|
5 years ago |
|
zxc
|
0308d7ce16
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zxc
|
777df11183
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
sunyuchao
|
beef21db9e
|
服务升级
|
5 years ago |
|
zxc
|
1d1b84c9c4
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev_thirdplatform
|
5 years ago |
|
sunyuchao
|
691792bc07
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
126a8d6fa9
|
微信第三方平台-redis的key修改
|
5 years ago |
|
sunyuchao
|
8d2486aa78
|
小程序登陆获取两个必要token
|
5 years ago |
|
wxz
|
77fe866d62
|
Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
