wxz
|
6b11a130a2
|
版本升级
|
5 years ago |
wangchao
|
e901f09aeb
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
# Conflicts:
# epmet-module/epmet-point/epmet-point-server/pom.xml
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.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
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java
|
5 years ago |
|
wxz
|
b15735f551
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
yinzuomei
|
fd59d0732b
|
heart-work:heart+1
|
5 years ago |
|
wxz
|
6e6dadc698
|
Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
Conflicts:
epmet-auth/deploy/docker-compose-test.yml
epmet-user/epmet-user-server/deploy/docker-compose-test.yml
|
5 years ago |
|
wangchao
|
63e7cc4dad
|
积分相关接口
|
5 years ago |
|
yinzuomei
|
aab45025a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
yinzuomei
|
8f4c0550b3
|
heart-work:point+1
|
5 years ago |
jianjun
|
7f87bc17fa
|
部署crm auth 所有环境版本号已升
|
5 years ago |
|
jianjun
|
f2b72223a1
|
Merge remote-tracking branch 'remotes/origin/dev_more_appid' into dev
|
5 years ago |
|
jianjun
|
ab7bb9827a
|
优化 兼容appId代码
|
5 years ago |
zxc
|
968ce35e23
|
epmet-third服务升级
|
5 years ago |
|
zxc
|
4141237cf8
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
sunyuchao
|
1e303d5dc5
|
Merge branches 'dev' and 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
zxc
|
f489119f6f
|
微信第三方平台-{APPID}/callback修改，获取component_access_token修改
|
5 years ago |
|
yinzuomei
|
1333ecee5c
|
heart-work:gateway+1
|
5 years ago |
|
yinzuomei
|
41ec65a423
|
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/redis/RedisKeys.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 |
|
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 |
|
jianjun
|
3fe8621ce0
|
部署user
|
5 years ago |
|
jianjun
|
65d2296fe6
|
Merge remote-tracking branch 'remotes/origin/dev_more_appid' into dev
|
5 years ago |
|
jianjun
|
99589dfa80
|
兼容appId
|
5 years ago |
zhangyongzhangyong
|
20bb9d1e8a
|
爱心互助-居民端
|
5 years ago |
|
jianjun
|
767984a62d
|
部署user
|
5 years ago |
|
jianjun
|
c77d08adfe
|
部署crm
|
5 years ago |
|
jianjun
|
afa5f67fec
|
Merge remote-tracking branch 'remotes/origin/dev_more_appid' into dev
|
5 years ago |
|
jianjun
|
8f3970dd23
|
捕获异常
|
5 years ago |
|
jianjun
|
84fdf63fb3
|
部署crm
|
5 years ago |
|
jianjun
|
df095635b7
|
部署auth
|
5 years ago |
|
jianjun
|
11c10ed2ab
|
部署auth和crm
|
5 years ago |
|
jianjun
|
167012c367
|
兼容多个appId
|
5 years ago |
|
zhangyongzhangyong
|
50841fe607
|
爱心互助-居民端-活动详情修改
|
5 years ago |
|
wxz
|
1cbf26ff62
|
版本升级
|
5 years ago |
|
zxc
|
4a74748ad2
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev_thirdplatform
|
5 years ago |
|
zhangyongzhangyong
|
7a75dd5afe
|
爱心互助-居民端
|
5 years ago |
zhaoqifeng
|
9e17b707e9
|
获取体验版二维码
|
5 years ago |
|
jianjun
|
0a752feafd
|
兼容多个appId
|
5 years ago |
|
jianjun
|
8432103aa7
|
Merge branches 'dev' and 'dev_more_appid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_more_appid
|
5 years ago |
|
jianjun
|
059b952027
|
恢复代码
|
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 |
|
jianjun
|
67fba9df27
|
Merge remote-tracking branch 'remotes/origin/dev_thirdplatform' into dev_support_more_appid
|
5 years ago |
|
wxz
|
a2cc244580
|
Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
sunyuchao
|
ee8584e854
|
服务升级
|
5 years ago |
|
zhangyongzhangyong
|
46aafc4c09
|
爱心互助-居民端
|
5 years ago |
|
jianjun
|
17e32575db
|
代码暂存
|
5 years ago |
|
sunyuchao
|
b8edbcdef0
|
工作端新增单客户选择组织进入首页接口
|
5 years ago |
|
jianjun
|
1800f42935
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_support_more_appid
|
5 years ago |
|
sunyuchao
|
0c721d6999
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
