 袁野
|
cc3cbc1576
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
 胡锐
|
71dd1561bb
|
提交diam
|
1 year ago |
|
袁野
|
cb6347ea15
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
胡锐
|
e1e02be6d8
|
Changes
|
1 year ago |
|
袁野
|
76b70c8449
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
袁野
|
b61809a9d1
|
Merge branch '2.0-master' into 2.0-dev
# Conflicts:
# hai-order/src/main/java/com/web/controller/OrderPayController.java
# hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java
# 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/service/impl/OrderServiceImpl.java
# hai-service/src/main/java/com/hai/order/type/OrderChildGoodsType.java
# hai-service/src/main/java/com/hai/order/type/OrderProductType.java
|
1 year ago |
|
袁野
|
6351b1df85
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
胡锐
|
acb5dca7b9
|
提交代码
|
1 year ago |
|
袁野
|
2980280f1c
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
胡锐
|
67cd88e026
|
提交代码
|
1 year ago |
|
袁野
|
bfe36261de
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
袁野
|
abde8252ed
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
胡锐
|
374f9c276a
|
提交代码
|
1 year ago |
|
胡锐
|
b713543fb7
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
1 year ago |
|
胡锐
|
7300282376
|
提交diam
|
1 year ago |
|
袁野
|
d7bfa1372f
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
胡锐
|
a655e83336
|
提交diam
|
1 year ago |
|
胡锐
|
aa18ef7b26
|
提交代码
|
1 year ago |
|
袁野
|
7fcdfd2e69
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
袁野
|
5e896ea70f
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
胡锐
|
a84ffaed41
|
提交代码
|
1 year ago |
|
袁野
|
8dc1261ab0
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
胡锐
|
0b4e1a06c2
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
1 year ago |
|
胡锐
|
c1bb86b341
|
提交代码
|
1 year ago |
|
袁野
|
d1a3694418
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
袁野
|
71c4f95fb0
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
袁野
|
d3bb627425
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
袁野
|
1919c2fcd8
|
1
|
1 year ago |
|
胡锐
|
7c3791ac07
|
提交代码
|
1 year ago |
|
袁野
|
95f98b2a21
|
1
|
1 year ago |
|
袁野
|
38dd67f618
|
1
|
1 year ago |
|
袁野
|
8b93147cf6
|
1
|
1 year ago |
|
袁野
|
1308c0bebb
|
1
|
1 year ago |
|
袁野
|
88cd132792
|
1
|
1 year ago |
|
袁野
|
7c837c272e
|
Merge branch '2.0-master' into 2.0-dev
|
1 year ago |
|
袁野
|
752f084954
|
1
|
1 year ago |
|
袁野
|
a08f3689c4
|
1
|
1 year ago |
|
袁野
|
a8994fa4bc
|
1
|
1 year ago |
|
袁野
|
2cc143e685
|
1
|
1 year ago |
|
袁野
|
b846e3f6d6
|
1
|
1 year ago |
|
袁野
|
54a79af122
|
1
|
1 year ago |
|
袁野
|
de244978b6
|
变更
|
1 year ago |
|
袁野
|
c361cba48d
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
袁野
|
3c2a156991
|
变更
|
1 year ago |
|
胡锐
|
e318408a84
|
Changes
|
1 year ago |
|
胡锐
|
3a55528375
|
提交代码
|
1 year ago |
|
胡锐
|
c189b4f70f
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
1 year ago |
|
胡锐
|
25916061ec
|
提交代码
|
1 year ago |
|
袁野
|
c69d5201dc
|
变更
|
1 year ago |
|
袁野
|
f1a142f3de
|
Merge branch '2.0-master' into 2.0-dev
# Conflicts:
# hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
# hai-user/src/main/java/com/web/controller/LoginController.java
|
1 year ago |
