 袁野
|
217e9e25b4
|
1
|
7 months ago |
|
袁野
|
81574f1b27
|
1
|
7 months ago |
|
袁野
|
fe357559ad
|
1
|
7 months ago |
|
袁野
|
a7c82de2c4
|
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
|
8 months 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
|
8 months 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
|
10 months ago |
|
袁野
|
7fbbbd5563
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
140169409d
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
47eedd711e
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
b975a83f84
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
9fa5b1a52e
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
d77c49c41e
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
22ff517917
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
12 months ago |
|
袁野
|
6f3b928ada
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
12 months ago |
|
袁野
|
95f98b2a21
|
1
|
1 year ago |
|
袁野
|
88cd132792
|
1
|
1 year ago |
|
袁野
|
2cc143e685
|
1
|
1 year ago |
|
袁野
|
1ac675b72b
|
变更
|
1 year ago |
|
袁野
|
717cbdcb0c
|
提交实物代码
|
2 years ago |
|
袁野
|
19c7504036
|
提交实物代码
|
2 years ago |
|
袁野
|
94ac746a72
|
提交实物代码
|
2 years ago |
|
袁野
|
4fe20c8f83
|
提交实物代码
|
2 years ago |
|
袁野
|
302736a0c9
|
优化话费业务流程
|
2 years ago |
|
袁野
|
249e59b74b
|
优化话费定时任务代码
|
2 years ago |
 胡锐
|
3df978ae80
|
提交代码
|
2 years ago |
|
袁野
|
06013e1aae
|
1
|
2 years ago |
|
胡锐
|
bed8049c00
|
提交代码
|
2 years ago |
|
袁野
|
ac8801bed3
|
优化话费定时任务代码
|
2 years ago |
|
袁野
|
2d13835ab0
|
优化话费定时任务代码
|
2 years ago |
|
胡锐
|
7f634f1f0d
|
提交代码
|
2 years ago |
|
袁野
|
9e11ee3473
|
1
|
2 years ago |
|
袁野
|
59c01a9e48
|
提交2。0代码
|
2 years ago |
|
袁野
|
94569a95f0
|
提交2。0代码
|
2 years ago |
|
袁野
|
9f92633130
|
提交2。0代码
|
2 years ago |
|
袁野
|
b19460705a
|
提交2。0代码
|
2 years ago |
|
袁野
|
898226866f
|
提交2。0代码
|
2 years ago |
|
袁野
|
a0f8008517
|
提交2。0代码
|
2 years ago |
|
胡锐
|
2ae18c0571
|
提交代码
|
2 years ago |
|
胡锐
|
ae015d378e
|
提交代码
|
2 years ago |
|
袁野
|
e2e6d22948
|
提交2。0代码
|
2 years ago |
|
袁野
|
0c895fc92b
|
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 |
|
袁野
|
f5c70d53ca
|
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 |
|
袁野
|
3bf7fcf3ea
|
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 |
|
袁野
|
270be7cf13
|
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 |
|
袁野
|
24f6a46c8b
|
修改配置星巴克 肯德基 会员充值 话费 微信商户号
|
2 years ago |
|
胡锐
|
a0d2ad940d
|
提交代码
|
2 years ago |
|
胡锐
|
3ddcaff3ca
|
提交代码
|
2 years ago |
|
袁野
|
c4fe67f5a8
|
1
|
2 years ago |
|
胡锐
|
72a3bbb787
|
提交代码
|
2 years ago |
|
胡锐
|
42bc1db51d
|
提交代码
|
2 years ago |
