 袁野
|
be3b31226e
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
袁野
|
5487d5d6be
|
变更
|
1 year ago |
|
袁野
|
f091875cb7
|
变更
|
1 year ago |
 胡锐
|
8c565ab449
|
提交代码
|
1 year ago |
|
袁野
|
bfb297ab08
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
# Conflicts:
# hai-service/src/main/java/com/hai/service/impl/HighCouponCodeServiceImpl.java
|
1 year ago |
|
胡锐
|
b36ee1b91e
|
提交代码
|
1 year ago |
|
袁野
|
198e338640
|
变更
|
1 year ago |
|
胡锐
|
fd201b86d7
|
提交代码
|
1 year ago |
|
胡锐
|
690b15947b
|
提交代码
|
1 year ago |
|
胡锐
|
f66e8baa0d
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
1 year ago |
|
胡锐
|
76a03b94f5
|
提交代码
|
1 year ago |
|
袁野
|
1ac675b72b
|
变更
|
1 year ago |
|
胡锐
|
e6f1881ebd
|
1
|
1 year ago |
|
胡锐
|
124f0945c9
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
1 year ago |
|
胡锐
|
363a689dbf
|
提交代码
|
1 year ago |
|
袁野
|
f388d88450
|
变更
|
1 year ago |
|
袁野
|
7f82edadf1
|
变更
|
1 year ago |
|
袁野
|
ab1865ae7b
|
变更
|
1 year ago |
|
袁野
|
6da0685121
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
袁野
|
eee564380e
|
Merge branch '2.0-master' into 2.0-dev
|
1 year ago |
|
袁野
|
b20b5b5ebf
|
修改话费
|
1 year ago |
|
袁野
|
544f407cb0
|
修改话费
|
1 year ago |
|
袁野
|
cea4c34719
|
修改话费
|
1 year ago |
|
袁野
|
d4cc23cce6
|
Merge remote-tracking branch 'origin/2.0-master' into 2.0-master
|
1 year ago |
|
胡锐
|
21813ce91b
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
1 year ago |
|
胡锐
|
a8f5b8edba
|
Merge branch '2.0-master' into 2.0-dev
|
1 year ago |
|
胡锐
|
fb7c28b255
|
提交代码
|
1 year ago |
|
袁野
|
a5d02d6420
|
修改话费
|
1 year ago |
|
袁野
|
5f46c6cea2
|
修改话费
|
1 year ago |
|
袁野
|
d9af516677
|
Merge branch '2.0-master' into 2.0-dev
# Conflicts:
# v1/src/main/java/com/v1/config/AuthConfig.java
|
1 year ago |
|
袁野
|
71b0b145ef
|
修改话费
|
1 year ago |
|
袁野
|
6630061cfe
|
修改话费
|
1 year ago |
|
袁野
|
07abe061cc
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
|
胡锐
|
31e6ebf4eb
|
提交代码
|
1 year ago |
|
袁野
|
18acc34c92
|
修改话费
|
1 year ago |
|
袁野
|
5f83a7d2e5
|
Merge branch '2.0-master' into 2.0-dev
# Conflicts:
# hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
# hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
|
1 year ago |
|
袁野
|
aa41b9197e
|
修改话费
|
1 year ago |
|
袁野
|
ea633defe2
|
修改优惠券包赠送问题
|
1 year ago |
|
袁野
|
f06272ddcc
|
修改优惠券包赠送问题
|
1 year ago |
|
胡锐
|
b68ca163ac
|
提交代码
|
1 year ago |
|
袁野
|
23c2c1822f
|
修改优惠券包赠送问题
|
2 years ago |
|
袁野
|
0ced285dea
|
修改优惠券包赠送问题
|
2 years ago |
|
袁野
|
2755f1dc63
|
提交实物代码
|
2 years ago |
|
袁野
|
0d230f5520
|
提交实物代码
|
2 years ago |
|
袁野
|
57fb4be4d2
|
提交实物代码
|
2 years ago |
|
胡锐
|
a4755cdf6a
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
2 years ago |
|
胡锐
|
864ce1790d
|
提交代码
|
2 years ago |
|
袁野
|
53dc3c810f
|
Merge branch '2.0-dev' into 2.0-master
|
2 years ago |
|
袁野
|
2e5a46495c
|
提交实物代码
|
2 years ago |
|
袁野
|
4f04c37200
|
Merge remote-tracking branch 'origin/2.0-master' into 2.0-master
# Conflicts:
# hai-service/src/main/java/com/hai/order/utils/OrderUtil.java
|
2 years ago |
