 胡锐
|
a8f5b8edba
|
Merge branch '2.0-master' into 2.0-dev
|
1 year ago |
|
胡锐
|
fb7c28b255
|
提交代码
|
1 year ago |
|
胡锐
|
31e6ebf4eb
|
提交代码
|
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 |
|
袁野
|
478fd3c074
|
Merge branch '2.0-dev' into 2.0-master
|
2 years ago |
|
袁野
|
06d83cbcde
|
提交实物代码
|
2 years ago |
|
袁野
|
ecb007c81e
|
提交实物代码
|
2 years ago |
|
袁野
|
717cbdcb0c
|
提交实物代码
|
2 years ago |
|
胡锐
|
a0e93c1715
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
2 years ago |
|
胡锐
|
cece097ed0
|
提交代码
|
2 years ago |
|
袁野
|
19c7504036
|
提交实物代码
|
2 years ago |
|
胡锐
|
a53bf3c552
|
提交代码
|
2 years ago |
|
胡锐
|
9e5cf88db9
|
提交代码
|
2 years ago |
|
胡锐
|
62587f26b5
|
提交代码
|
2 years ago |
|
胡锐
|
6e57555a28
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
2 years ago |
|
胡锐
|
1d5529fe89
|
提交代码
|
2 years ago |
|
袁野
|
d9644e41da
|
提交实物代码
|
2 years ago |
|
胡锐
|
76e47530dd
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
2 years ago |
|
胡锐
|
cb4b3194cd
|
提交代码
|
2 years ago |
|
袁野
|
55a63ec433
|
Merge branch '2.0-dev' into 2.0-master
|
2 years ago |
|
袁野
|
94ac746a72
|
提交实物代码
|
2 years ago |
|
袁野
|
65ac7d6bc0
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
|
胡锐
|
c242a6b5d5
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
2 years ago |
|
胡锐
|
0b7b1b8262
|
提交代码
|
2 years ago |
|
袁野
|
c1880b58af
|
提交实物代码
|
2 years ago |
|
袁野
|
0ea3d02eb0
|
提交实物代码
|
2 years ago |
|
袁野
|
c2babeab2f
|
提交实物代码
|
2 years ago |
|
胡锐
|
25d02c1fdd
|
提交代码
|
2 years ago |
|
胡锐
|
103e51e0ae
|
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
2 years ago |
|
胡锐
|
3e3d987d81
|
提交代码
|
2 years ago |
|
袁野
|
4fe20c8f83
|
提交实物代码
|
2 years ago |
|
胡锐
|
8825ff18c9
|
1
|
2 years ago |
|
胡锐
|
8280e5f69b
|
Changes
|
2 years ago |
|
胡锐
|
fc3e972856
|
Changes
|
2 years ago |
|
胡锐
|
6af731d8d6
|
::wq
:wq
Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev
|
2 years ago |
|
胡锐
|
10051fb82e
|
提交代码
|
2 years ago |
