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 |
zhangyongzhangyong
|
6139e49c91
|
活动主列表修改
|
5 years ago |
|
wangchao
|
7e43d169ee
|
user +1
|
5 years ago |
|
wangchao
|
835c40c5b7
|
Merge remote-tracking branch 'origin/dev_heart' into dev
|
5 years ago |
|
wangchao
|
7483ba24aa
|
Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
|
5 years ago |
|
wangchao
|
5301ef2f6f
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
5 years ago |
|
wangchao
|
fa5854cc6b
|
用户缓存更新补充 党员代码找回
|
5 years ago |
yinzuomei
|
f934c7c319
|
heart+1
|
5 years ago |
|
yinzuomei
|
7fd0a8471e
|
Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart
|
5 years ago |
|
jianjun
|
0a079de4fc
|
Merge remote-tracking branch 'remotes/origin/dev' into release
# Conflicts:
# epmet-user/epmet-user-server/deploy/docker-compose-test.yml
|
5 years ago |
|
jianjun
|
9309fd98bc
|
部署user
|
5 years ago |
|
zhangyongzhangyong
|
910a7e8d79
|
活动报名接口，增加返回内容
|
5 years ago |
|
jianjun
|
9dea4e17d4
|
Merge remote-tracking branch 'remotes/origin/dev_more_appid' into dev
|
5 years ago |
|
jianjun
|
884e394366
|
修改错误
|
5 years ago |
|
zhangyongzhangyong
|
a9bbcd5726
|
列表状态SQL修改
|
5 years ago |
wxz
|
0afcf2c0d2
|
版本升级
|
5 years ago |
|
jianjun
|
aa4da880f6
|
部署user
|
5 years ago |
|
jianjun
|
31454d07c6
|
Merge remote-tracking branch 'remotes/origin/dev' into release
|
5 years ago |
|
jianjun
|
f8bec2e42d
|
升级user
|
5 years ago |
|
jianjun
|
be2b110aa0
|
Merge remote-tracking branch 'remotes/origin/dev_more_appid' into dev
|
5 years ago |
|
sunyuchao
|
f2e33d78fe
|
服务升级
|
5 years ago |
|
jianjun
|
84cf3b4e36
|
修改错误
|
5 years ago |
|
sunyuchao
|
77a6db2f75
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
sunyuchao
|
0a5d0213cd
|
bug修改
|
5 years ago |
