sunyuchao
|
292ea6c65b
|
公众号wxcodetotken接口调整
|
5 years ago |
|
sunyuchao
|
447186c996
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
zxc
|
15f45579df
|
微信第三方平台-类型转换修改
|
5 years ago |
|
sunyuchao
|
9d5d961526
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
sunyuchao
|
02f6d40618
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
yinzuomei
|
c89882fc86
|
heart+1
|
5 years ago |
|
zxc
|
8353234e99
|
微信第三方平台-feign修改http
|
5 years ago |
|
yinzuomei
|
24b460ee92
|
heart:新增act_grant_point_log
|
5 years ago |
jianjun
|
1ffa79c967
|
升级commonservice，point
|
5 years ago |
|
jianjun
|
9cbd786d5e
|
Merge remote-tracking branch 'remotes/origin/dev_heart' into dev
|
5 years ago |
|
sunyuchao
|
43164fa113
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
jianjun
|
88f4c6a3bf
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
jianjun
|
1ffc104028
|
添加脚本
|
5 years ago |
zhaoqifeng
|
868db9c798
|
调第三方feign改成HTTP Client
|
5 years ago |
wangchao
|
b8ffd3cb26
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
wangchao
|
08995f4d66
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
# Conflicts:
# epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java
|
5 years ago |
|
jianjun
|
f1cca49ba1
|
修改数据类型
|
5 years ago |
|
wangchao
|
a2e61fb4b4
|
POINT USER 修改
|
5 years ago |
|
yinzuomei
|
05db6ad2c8
|
heart+1
|
5 years ago |
|
yinzuomei
|
0753fd73ba
|
Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
|
5 years ago |
|
yinzuomei
|
b1605e7856
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
yinzuomei
|
4c28336db0
|
heart:bug修改
|
5 years ago |
zhangyongzhangyong
|
95986bbd22
|
非居民报名活动失败，重复提示去除
|
5 years ago |
|
sunyuchao
|
d5bf7a3957
|
服务升级
|
5 years ago |
|
sunyuchao
|
a0411ab43d
|
添加区分服务字段source
|
5 years ago |
|
yinzuomei
|
413a7dd665
|
Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
|
5 years ago |
|
zhangyongzhangyong
|
515d978eec
|
居民参加活动，接口修改
|
5 years ago |
|
zhangyongzhangyong
|
9cd21a9223
|
解决报名人数为null的错误
|
5 years ago |
|
zxc
|
f3b2ab4fe3
|
epmet-third服务升级
|
5 years ago |
|
zxc
|
c8c3daaab4
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
09ff1027aa
|
微信第三方平台-公众号注册
|
5 years ago |
|
yinzuomei
|
1282e16cce
|
heart+1
|
5 years ago |
|
wangchao
|
32f7ce9b74
|
POINT USER 服务更新
|
5 years ago |
|
wangchao
|
d5bd3632ab
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
wangchao
|
f62ed7c7ae
|
POINT USER 修改
|
5 years ago |
|
yinzuomei
|
e59918c480
|
heart+1
|
5 years ago |
|
zhangyongzhangyong
|
4f02f36d60
|
活动即将开始，接口反参内容修改
|
5 years ago |
|
yinzuomei
|
8e5dc0edb8
|
Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
Conflicts:
epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
epmet-module/epmet-point/epmet-point-server/pom.xml
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
epmet-module/epmet-third/epmet-third-server/pom.xml
epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
epmet-module/resi-mine/resi-mine-server/pom.xml
epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
epmet-user/epmet-user-server/pom.xml
epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.6__add_isRegister.sql
|
5 years ago |
|
zxc
|
8276d59017
|
微信第三方平台-日志添加
|
5 years ago |
|
zhaoqifeng
|
e7a8715178
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhaoqifeng
|
a94d9614d8
|
第三方版本更新
|
5 years ago |
|
zhaoqifeng
|
ac2d0efa46
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
wangchao
|
accacfd87a
|
mine user point 服务更新
|
5 years ago |
|
wangchao
|
304107ee21
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
wangchao
|
f9530c3768
|
积分bug修改
|
5 years ago |
|
zhangyongzhangyong
|
2a5df01844
|
Merge branch 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
|
5 years ago |
|
jianjun
|
d530bef8c9
|
升级user
|
5 years ago |
|
jianjun
|
530c640a93
|
升级user
|
5 years ago |
|
jianjun
|
4e4a764fb8
|
升级user
|
5 years ago |
|
jianjun
|
d5b5092fda
|
Merge remote-tracking branch 'remotes/origin/dev_more_appid' into dev
|
5 years ago |
