 袁野
|
4ae91e269d
|
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 |
|
袁野
|
f81e68b623
|
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
|
11 months ago |
|
袁野
|
2172996361
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
 胡锐
|
7ca9ae6559
|
提交代码
|
11 months ago |
|
袁野
|
cabf16b8e7
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
# Conflicts:
# hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
|
11 months ago |
|
袁野
|
bb1500caa9
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
胡锐
|
53c4506a17
|
提交diam
|
11 months ago |
|
胡锐
|
5a78fc039e
|
1
|
11 months ago |
|
袁野
|
c01f808c13
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
f5d6281c4c
|
Merge branch '2.0-dev' into new-dev
# Conflicts:
# hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java
|
11 months ago |
|
袁野
|
f16c2cc000
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
4deb3dfbe3
|
Merge remote-tracking branch 'origin/new-dev' into new-dev
|
11 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 |
|
袁野
|
8b8d3c74b3
|
Merge branch '2.0-dev' into new-dev
|
11 months ago |
|
袁野
|
8ecac65e4d
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
e90f4107cd
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
f7fbf15176
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
39b5450654
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
# Conflicts:
# hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java
# hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java
# hai-service/src/main/java/com/hai/order/type/OrderChildGoodsType.java
|
11 months ago |
|
袁野
|
47eedd711e
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
06bc72e01b
|
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 |
|
胡锐
|
8aee4f8fe5
|
提交代码
|
11 months ago |
|
袁野
|
9fa5b1a52e
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
c2cefe0ea1
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
25034e4938
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
胡锐
|
fd3c7bb1d3
|
提交代码
|
11 months ago |
|
胡锐
|
1faa9a4b74
|
提交代码
|
11 months ago |
|
胡锐
|
3e25b0a9dd
|
提交代码
|
11 months ago |
|
袁野
|
9f5de03692
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
胡锐
|
bea7f4e7b6
|
提交代码
|
11 months ago |
|
胡锐
|
6fac43e6f3
|
提交代码
|
11 months ago |
|
袁野
|
84e8ab1b18
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
胡锐
|
0667fd6f04
|
提交代码
|
11 months ago |
|
袁野
|
70178c7e5a
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
dad6ed797d
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
胡锐
|
fc611e2b22
|
提交代码
|
11 months ago |
|
胡锐
|
5e8cf913ba
|
提交代码
|
11 months ago |
|
袁野
|
5028901509
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
胡锐
|
68332bc444
|
提交代码
|
11 months ago |
|
胡锐
|
7d49e527f1
|
提交代码
|
11 months ago |
|
胡锐
|
348e010644
|
提交代码
|
11 months ago |
|
袁野
|
7076903b16
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
306610d94e
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
胡锐
|
bbaeacc24b
|
提交代码
|
11 months ago |
|
袁野
|
7c0bed1913
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
3453471a92
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
胡锐
|
ba8537473c
|
提交代码
|
11 months ago |
|
袁野
|
5a47129181
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
96898520d3
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
