yinzuomei
|
267e0f1636
|
heart-work:测试用
|
5 years ago |
|
yinzuomei
|
a0276e69dc
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
yinzuomei
|
cfb5912191
|
heart-work:测试bug修改
|
5 years ago |
zhangyongzhangyong
|
20bb9d1e8a
|
爱心互助-居民端
|
5 years ago |
|
zhangyongzhangyong
|
50841fe607
|
爱心互助-居民端-活动详情修改
|
5 years ago |
|
zhangyongzhangyong
|
7a75dd5afe
|
爱心互助-居民端
|
5 years ago |
|
yinzuomei
|
c5f0df94f4
|
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 |
|
yinzuomei
|
c0e5578683
|
heart-work:重新发布活动
|
5 years ago |
|
zhangyongzhangyong
|
46aafc4c09
|
爱心互助-居民端
|
5 years ago |
|
yinzuomei
|
4d4d2a6ebc
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
yinzuomei
|
77690bca12
|
heart-work:重新编辑-获取活动详情
|
5 years ago |
|
zhangyongzhangyong
|
2523e7ffb3
|
爱心互助-居民端-增加事件发送
|
5 years ago |
|
yinzuomei
|
96c85b6458
|
heart-work:保存添加回顾
|
5 years ago |
|
yinzuomei
|
c219e036f9
|
heart-work:积分发放添加消息事件remark
|
5 years ago |
|
yinzuomei
|
2dd2c7fd11
|
heart-work:积分发放添加消息事件
|
5 years ago |
jianjun
|
f8830603f4
|
系统支持的事件类型枚举类
|
5 years ago |
|
jianjun
|
ba3aeb55cb
|
系统支持的事件类型枚举类
|
5 years ago |
|
jianjun
|
4a382f7c3c
|
系统支持的事件类型枚举类
|
5 years ago |
|
yinzuomei
|
cd90485f19
|
Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
Conflicts:
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java
|
5 years ago |
|
yinzuomei
|
51d8e62877
|
heart-work:发布活动修改
|
5 years ago |
|
yinzuomei
|
750583687a
|
heart-work:暂存
|
5 years ago |
|
yinzuomei
|
8a510a6b0d
|
heart-work:已结束-保存活动实际开始结束时间
|
5 years ago |
|
yinzuomei
|
aa8f99359c
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
yinzuomei
|
ba87e8f8ce
|
heart-work:积分发放
|
5 years ago |
|
zhangyongzhangyong
|
ac5f4ec2e9
|
爱心互助-代码清理
|
5 years ago |
|
jianjun
|
767fa61bca
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
jianjun
|
8e83a93a86
|
添加获取消息网关事件类型接口
|
5 years ago |
|
zhangyongzhangyong
|
24a841a0a7
|
爱心互助接口调整-一波
|
5 years ago |
zxc
|
ced1fc616b
|
epmet-third服务升级
|
5 years ago |
|
zxc
|
39dc9ffe1a
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
9a91f7c649
|
微信第三方平台-授权回调
|
5 years ago |
wxz
|
89dd99ab2e
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
wxz
|
9f85f94945
|
HttpClientManager新增下载文件，获取byte[]的方法
|
5 years ago |
|
zxc
|
0ba119a872
|
epmet-third服务升级
|
5 years ago |
|
zxc
|
ed46fa0bbe
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
a01057d543
|
微信第三方平台-授权回调
|
5 years ago |
|
jianjun
|
c9759a9f89
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
jianjun
|
cfd46b1bdf
|
添加appId
|
5 years ago |
sunyuchao
|
592aacb6c6
|
服务升级
|
5 years ago |
|
sunyuchao
|
5a6b16c3b9
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
sunyuchao
|
5bf19ca3f8
|
政府端enterorg接口调用微信api方式调整
|
5 years ago |
|
sunyuchao
|
0b36296d41
|
服务升级
|
5 years ago |
|
sunyuchao
|
aafcb9c266
|
修改两端登陆获取基本信息逻辑，暂时不去获取用户基本信息
|
5 years ago |
|
yinzuomei
|
4458ea0725
|
heart-work:给分、不给分、重新处理canceled
|
5 years ago |
|
sunyuchao
|
6c4b4f27ff
|
Merge branches 'dev' and 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
yinzuomei
|
2fdb9e3485
|
heart-work:canceled
|
5 years ago |
zhaoqifeng
|
f246fcfe73
|
第三方代码上传
|
5 years ago |
|
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 |
