jianjun
|
f9a29ebb11
|
Merge remote-tracking branch 'remotes/origin/dev_thirdplatform' into dev_heart
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
|
5 years ago |
zxc
|
910d24fc46
|
微信第三方平台-代码审核回调
|
5 years ago |
yinzuomei
|
41a251dc3a
|
heart-work:ACT_POINT_LOG表删除POINT_TYPE
|
5 years ago |
|
yinzuomei
|
8e4d11745f
|
heart-work:ACT_POINT_LOG表删除POINT_TYPE
|
5 years ago |
|
zxc
|
da3ef9c240
|
epmet-third服务升级
|
5 years ago |
|
zxc
|
d10165aaec
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
b44ed74ffa
|
微信第三方平台-funcInfo
|
5 years ago |
|
zxc
|
a1fd9cba25
|
微信第三方平台-优化
|
5 years ago |
|
yinzuomei
|
26343ea219
|
heart-work:ACT_POINT_LOG：EFFECT_FLAG新增1有效0无效，只有在活动真正结束后才是1
|
5 years ago |
|
yinzuomei
|
94e99edd57
|
heart-work:act_user_log去除已签到signedin
|
5 years ago |
|
zxc
|
9f513914bf
|
epmet-third服务升级
|
5 years ago |
|
zxc
|
e60cfdf67f
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
d0792ac995
|
微信第三方平台-授权回调
|
5 years ago |
|
yinzuomei
|
6f83776e2c
|
heart-work:修改入参
|
5 years ago |
wxz
|
e0a154b417
|
版本升级
|
5 years ago |
|
yinzuomei
|
185c7efca4
|
heart-work:已结束人员
|
5 years ago |
|
wxz
|
e480d51ab2
|
版本升级
|
5 years ago |
|
yinzuomei
|
ddf5a5f249
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActConstant.java
|
5 years ago |
|
wxz
|
9a0a053664
|
版本升级
|
5 years ago |
|
yinzuomei
|
da49ee682d
|
heart-work:act_user_log删除* 发放积分rewarded 拒绝发放积分refuse_reward 重新处理processing这三个操作记录，在act_point_log记录
|
5 years ago |
|
wxz
|
8beb8d42e0
|
修复：运营端客户列表，判断是否有管理员->判断是否有根管理员
|
5 years ago |
zhangyongzhangyong
|
1e6fd9417d
|
爱心互助-枚举
|
5 years ago |
|
yinzuomei
|
ddbff44121
|
heart-work:已结束、已取消活动列表api
|
5 years ago |
|
yinzuomei
|
e8f05c0bb6
|
heart-work:主办方列表、进行中活动列表api
|
5 years ago |
|
zxc
|
3fd8f6da45
|
epmet-third服务升级
|
5 years ago |
|
zxc
|
4c13394376
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
a46583f3ba
|
微信第三方平台-授权回调修改
|
5 years ago |
|
yinzuomei
|
ea1dc2ec16
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
yinzuomei
|
f476450398
|
heart-work:审核、拒绝api
|
5 years ago |
|
zxc
|
8eb5a784dc
|
epmet-third服务升级
|
5 years ago |
|
zxc
|
5b34f79ae4
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
c06ff8ce42
|
微信第三方平台-component_verify_ticket修改，绑定开放平台账户修改
|
5 years ago |
|
wxz
|
1b0b069a23
|
版本升级
|
5 years ago |
|
wxz
|
2272119ee9
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
wxz
|
9d96c331a6
|
版本升级
|
5 years ago |
|
zhangyongzhangyong
|
03e89e55e5
|
Merge branch 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
|
5 years ago |
|
zhangyongzhangyong
|
423a9fef1d
|
爱心互助-居民端接口3
|
5 years ago |
sunyuchao
|
86f5bb822d
|
服务升级
|
5 years ago |
|
jianjun
|
3629bd2662
|
积分规则消费消息接口暂存；2接入钉钉错误日志消息
|
5 years ago |
|
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 |
