袁野
|
42813d4068
|
Merge branch 'new-dev' into 2.0-dev
# Conflicts:
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderCreateHandleServiceImpl.java
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java
|
1 year ago |
袁野
|
ba05c0d457
|
Merge branch 'new-dev' into 2.0-dev
# Conflicts:
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderCreateHandleServiceImpl.java
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java
|
1 year ago |
袁野
|
d752345fb2
|
Merge branch 'new-dev' into 2.0-dev
# Conflicts:
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderCreateHandleServiceImpl.java
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java
|
1 year ago |
袁野
|
54e0b04eb6
|
Merge branch 'new-dev' into 2.0-dev
# Conflicts:
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderCreateHandleServiceImpl.java
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java
|
1 year ago |
袁野
|
9f48149490
|
Merge branch 'new-dev' into 2.0-dev
# Conflicts:
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderCreateHandleServiceImpl.java
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java
|
1 year ago |
袁野
|
b975a83f84
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
9fa5b1a52e
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
c2cefe0ea1
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
70178c7e5a
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
dad6ed797d
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
22ff517917
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
6f3b928ada
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
3da709c3ec
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
c35d2184ba
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
0bfffaf9cf
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
95f98b2a21
|
1
|
2 years ago |
袁野
|
198e338640
|
变更
|
2 years ago |
袁野
|
1ac675b72b
|
变更
|
2 years ago |
袁野
|
94ac746a72
|
提交实物代码
|
2 years ago |
胡锐
|
eda85fdd27
|
提交代码
|
2 years ago |
袁野
|
ac8801bed3
|
优化话费定时任务代码
|
2 years ago |
胡锐
|
44e3361d27
|
提交代码
|
2 years ago |
袁野
|
a0f8008517
|
提交2。0代码
|
2 years ago |
胡锐
|
50f8c1942e
|
提交代码
|
2 years ago |
胡锐
|
2ae18c0571
|
提交代码
|
2 years ago |
胡锐
|
bc015c00c2
|
提交代码
|
2 years ago |
袁野
|
db3341f13a
|
Merge branch 'master' into 2.0-dev
* master:
修改配置星巴克 肯德基 会员充值 话费 微信商户号
修改配置星巴克 肯德基 会员充值 话费 微信商户号
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
# hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
|
2 years ago |
袁野
|
35dec1eb1f
|
提交修改
|
3 years ago |
袁野
|
6a4aeaeaa7
|
1
|
3 years ago |
袁野
|
072d61a722
|
修改话费定时任务问题
|
3 years ago |
袁野
|
6d31bc0e11
|
修改话费定时任务问题
|
3 years ago |
胡锐
|
7935dc34ac
|
提交代码
|
3 years ago |
胡锐
|
ad8cdb27cf
|
提交代码
|
3 years ago |
胡锐
|
75ca151c40
|
提交代码
|
3 years ago |
胡锐
|
d287869ffa
|
提交代码
|
3 years ago |
胡锐
|
61866bfaf4
|
1
|
3 years ago |
胡锐
|
da705b10bd
|
提交代码
|
3 years ago |
袁野
|
65cb50c39d
|
提交代码
|
3 years ago |
袁野
|
2bcf47b9a3
|
上传千猪肯德基 会员充值内容
|
3 years ago |
袁野
|
541356d49f
|
api需求上传
|
3 years ago |
袁野
|
c2853a33d6
|
合并话费修改
|
3 years ago |
袁野
|
a1edf5d198
|
合并代码
|
3 years ago |
胡锐
|
5d25009fa7
|
提交代码
|
3 years ago |
胡锐
|
3920c7e322
|
提交代码
|
3 years ago |
胡锐
|
0b534f4a9e
|
提交代码
|
3 years ago |
胡锐
|
0459a6920f
|
银联分期
|
3 years ago |
胡锐
|
5d065c2977
|
还原团油改动代码
|
3 years ago |
袁野
|
c1f18d94aa
|
提交修改
|
4 years ago |
袁野
|
8ac800fad6
|
1
|
4 years ago |
袁野
|
e0baa1e5c9
|
提交修改
|
4 years ago |