 胡锐
|
bd6790acfa
|
提交代码
|
8 months ago |
|
胡锐
|
7c6e737b67
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
8 months ago |
|
胡锐
|
38f54293e9
|
提交代码
|
8 months ago |
 袁野
|
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
|
8 months ago |
|
袁野
|
ec679f98c9
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
8 months ago |
|
袁野
|
51d26bf016
|
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 |
|
胡锐
|
94bb14151b
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
8 months ago |
|
胡锐
|
1f2f0c1b29
|
提交代码
|
8 months ago |
|
袁野
|
4176f7d6da
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
8 months ago |
|
袁野
|
8f57fe9b8f
|
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 |
|
胡锐
|
d092ee8f0e
|
提交代码
|
8 months 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
|
8 months 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
|
8 months ago |
|
袁野
|
935f495a1c
|
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 |
|
袁野
|
37f768ac18
|
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 |
|
袁野
|
3faaca057a
|
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 |
|
袁野
|
a502b8e502
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
10 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 |
|
胡锐
|
bc4969d871
|
提交代码
|
10 months ago |
|
胡锐
|
253ef609a4
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
10 months ago |
|
胡锐
|
22f497b1a3
|
提交代码
|
10 months ago |
|
袁野
|
415a13e8ec
|
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 |
|
袁野
|
7ed69e6279
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
# Conflicts:
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java
|
10 months ago |
|
袁野
|
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 |
