袁野
|
06bc72e01b
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
b975a83f84
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
9f5de03692
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
3453471a92
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
af238d45f0
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
77ea0f59a1
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
22ff517917
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
6038b9973b
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
8bbce56b0f
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
632a92173f
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
袁野
|
1919c2fcd8
|
1
|
2 years ago |
袁野
|
88cd132792
|
1
|
2 years ago |
袁野
|
752f084954
|
1
|
2 years ago |
袁野
|
198e338640
|
变更
|
2 years ago |
袁野
|
c2babeab2f
|
提交实物代码
|
2 years ago |
袁野
|
4fe20c8f83
|
提交实物代码
|
2 years ago |
胡锐
|
9170a7ca25
|
提交代码
|
2 years ago |
胡锐
|
19c887b939
|
提交代码
|
2 years ago |
袁野
|
6bca0b0faa
|
Merge branch 'dev_yy' into 2.0-dev
* dev_yy: (25 commits)
提交代理商
1
1
提交实物
提交代码
提交代码
提交代码
提交抽奖代码
1
提交代码
提交代码
提交代码
提交代码
提交代码
提交
1
1
修改首页没有积分专区
提交代码
修改小程序注册用券
...
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
# hai-service/src/main/java/com/hai/common/utils/DateUtil.java
# hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
# hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
# hai-service/src/main/java/com/hai/entity/HighChildOrder.java
# hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
# hai-service/src/main/java/com/hai/entity/HighOrder.java
# hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
# hai-service/src/main/java/com/hai/service/HighUserService.java
# hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
# hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
|
3 years ago |
袁野
|
884daa1f39
|
提交代理商
|
3 years ago |
胡锐
|
abb4fc1f57
|
提交代码
|
3 years ago |
袁野
|
cf6f1d4c6a
|
1
|
3 years ago |
袁野
|
3c00cb133f
|
1
|
3 years ago |
袁野
|
c4fe67f5a8
|
1
|
3 years ago |
胡锐
|
d3f57a533b
|
提交代码
|
3 years ago |
胡锐
|
f95e0b92ea
|
提交代码
|
3 years ago |
胡锐
|
f906a4dfb3
|
提交代码
|
3 years ago |
袁野
|
ace46b4beb
|
21
|
3 years ago |
胡锐
|
3cfe1aa378
|
提交代码
|
3 years ago |
胡锐
|
5e9230c9dd
|
提交代码
|
3 years ago |
胡锐
|
c0b4ed31f2
|
提交代码
|
3 years ago |
胡锐
|
ddb54d37cd
|
提交代码
|
3 years ago |
袁野
|
65cb50c39d
|
提交代码
|
3 years ago |
胡锐
|
890989902b
|
提交代码
|
3 years ago |
袁野
|
3aab986705
|
提交代码修改
|
3 years ago |
胡锐
|
d46f4e848c
|
提交代码
|
3 years ago |
胡锐
|
c82ca24c2d
|
提交代码
|
3 years ago |
胡锐
|
8724386e31
|
提交代码
|
3 years ago |
袁野
|
d0555e8d79
|
修改话费订单导出
|
3 years ago |
袁野
|
edd4771bd8
|
修改话费订单导出
|
3 years ago |
袁野
|
3b12e413ad
|
合并话费修改
|
3 years ago |
胡锐
|
0ef6ba7957
|
提交代码
|
3 years ago |
袁野
|
d8302465cf
|
1
|
3 years ago |
胡锐
|
8c2d32e7d9
|
提交代码
|
3 years ago |
胡锐
|
cdd8718b3d
|
提交代码
|
3 years ago |
袁野
|
620fd4738c
|
合并代码
|
3 years ago |
袁野
|
a1edf5d198
|
合并代码
|
3 years ago |
胡锐
|
0e3de283d6
|
提交代码
|
3 years ago |
胡锐
|
6548741982
|
提交diam
|
3 years ago |
胡锐
|
1cecea1e90
|
提交代码
|
3 years ago |