sunyuchao
|
af482cc528
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev_thirdplatform
|
5 years ago |
|
sunyuchao
|
70c9e944c8
|
运营接口bug修改
|
5 years ago |
jianjun
|
f16d999157
|
升级gateway
|
5 years ago |
|
jianjun
|
d7cb9add14
|
Merge remote-tracking branch 'remotes/origin/dev_heart' into dev
|
5 years ago |
|
jianjun
|
ca9ce0d36a
|
调整gateway路由拦截配置
|
5 years ago |
zxc
|
34b3317deb
|
epmet-third服务升级
|
5 years ago |
|
zxc
|
083b17669b
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
7e380bf6b6
|
微信第三方平台-授权回调
|
5 years ago |
|
zxc
|
8de8cb3f28
|
epmet-third服务升级
|
5 years ago |
|
zxc
|
98d1987c0b
|
Merge remote-tracking branch 'origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
b87d7a3b2c
|
微信第三方平台-授权回调修改
|
5 years ago |
|
sunyuchao
|
d6767b20dd
|
服务升级
|
5 years ago |
zhangyongzhangyong
|
a637ff1b14
|
【我的】列表sql修改
|
5 years ago |
|
jianjun
|
45b186f6a4
|
体验版部署user
|
5 years ago |
|
jianjun
|
fbbe9c21f5
|
Merge remote-tracking branch 'remotes/origin/dev' into release
|
5 years ago |
|
jianjun
|
b4e36334e2
|
升级user
|
5 years ago |
|
jianjun
|
c7db4e8be5
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev
|
5 years ago |
|
jianjun
|
3029b6cf0e
|
再次调整打印日志
|
5 years ago |
|
jianjun
|
a847a3a2cf
|
升级user
|
5 years ago |
|
jianjun
|
9b7fb0804d
|
Merge remote-tracking branch 'remotes/origin/dev' into release
|
5 years ago |
|
jianjun
|
ab0397db71
|
升级user
|
5 years ago |
|
jianjun
|
1b6ceceed6
|
认证党员逻辑添加日志
|
5 years ago |
|
jianjun
|
e2b72e3ff8
|
Merge remote-tracking branch 'remotes/origin/dev' into release
|
5 years ago |
|
jianjun
|
949bb3e06d
|
Merge remote-tracking branches 'remotes/origin/dev_heart' and 'remotes/origin/dev_thirdplatform' into dev
|
5 years ago |
|
jianjun
|
295caf82b1
|
Merge remote-tracking branch 'remotes/origin/dev_more_appid' into dev_thirdplatform
# Conflicts:
# epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
|
5 years ago |
|
jianjun
|
d8d6ec6f20
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_heart
|
5 years ago |
|
jianjun
|
8000db55f2
|
Merge remote-tracking branch 'remotes/origin/dev_more_appid' into dev_heart
# Conflicts:
# epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
|
5 years ago |
|
jianjun
|
a01cce7c97
|
升级user
|
5 years ago |
|
jianjun
|
2f6000bdd9
|
Merge remote-tracking branch 'remotes/origin/dev_more_appid' into release
# Conflicts:
# epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
|
5 years ago |
|
jianjun
|
df5af7b7f8
|
升级user
|
5 years ago |
|
jianjun
|
65f5e7fe66
|
Merge remote-tracking branch 'remotes/origin/dev_more_appid' into dev
# Conflicts:
# epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
|
5 years ago |
|
jianjun
|
e1cb47e907
|
认证党员逻辑添加日志
|
5 years ago |
|
jianjun
|
c510456a04
|
部署user
|
5 years ago |
|
jianjun
|
447512e135
|
Merge remote-tracking branch 'remotes/origin/dev' into release
|
5 years ago |
wangchao
|
26b858f40f
|
用户+1
|
5 years ago |
|
wangchao
|
82993dcc85
|
Merge remote-tracking branch 'origin/dev_heart' into dev
|
5 years ago |
|
wangchao
|
4f90ef54fe
|
用户缓存修改
|
5 years ago |
|
sunyuchao
|
728c95833d
|
服务升级
|
5 years ago |
|
sunyuchao
|
3418a5f095
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
sunyuchao
|
fb6277ab86
|
Bug修改
|
5 years ago |
|
jianjun
|
146d84cde1
|
部署user
|
5 years ago |
|
jianjun
|
0245bf4bbd
|
Merge remote-tracking branch 'remotes/origin/dev' into release
|
5 years ago |
|
sunyuchao
|
e5c3ea1981
|
服务升级
|
5 years ago |
|
jianjun
|
477d451010
|
Merge remote-tracking branch 'remotes/origin/dev' into release
|
5 years ago |
|
sunyuchao
|
de92fcdd00
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
sunyuchao
|
0ddec0aca6
|
httpclient调用结果处理方式变化
|
5 years ago |
|
wangchao
|
c4bc2f1920
|
Merge remote-tracking branch 'remotes/origin/dev_heart' into dev
|
5 years ago |
|
wangchao
|
68817cb32f
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
wangchao
|
fdf6a4552f
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
|
5 years ago |
|
wangchao
|
cb186a0a75
|
删除多余代码
|
5 years ago |
