胡锐
|
ac288f6c0d
|
提交代码
|
2 years ago |
胡锐
|
58b4f87b6e
|
提交diam
|
2 years ago |
胡锐
|
cb0e757f8f
|
提交代码
|
2 years ago |
胡锐
|
9bc8963757
|
提交代码
|
2 years ago |
胡锐
|
af288a4314
|
1
|
2 years ago |
胡锐
|
db24b32313
|
提交代码
|
2 years ago |
胡锐
|
a56dee6ada
|
提交代码
|
2 years ago |
胡锐
|
7d08f6592a
|
提交代码
|
2 years ago |
胡锐
|
16de11680d
|
提交代码
|
2 years ago |
胡锐
|
551cbd6504
|
提交代码
|
2 years ago |
胡锐
|
dac0b455a0
|
提交代码
|
2 years ago |
胡锐
|
9170a7ca25
|
提交代码
|
2 years ago |
袁野
|
06013e1aae
|
1
|
2 years ago |
胡锐
|
a8d815efa8
|
提交代码
|
2 years ago |
胡锐
|
e5bb1c8241
|
提交代码
|
2 years ago |
袁野
|
03f9ca62a0
|
优化话费定时任务代码
|
2 years ago |
胡锐
|
f70899b16a
|
提交代码
|
2 years ago |
袁野
|
2d13835ab0
|
优化话费定时任务代码
|
2 years ago |
胡锐
|
7961dff622
|
提交代码
|
2 years ago |
袁野
|
59c01a9e48
|
提交2。0代码
|
2 years ago |
胡锐
|
4f7ba9881c
|
提交代码
|
2 years ago |
胡锐
|
a7755cabbd
|
提交代码
|
2 years ago |
胡锐
|
7de8bc2fc0
|
提交代码
|
2 years ago |
袁野
|
94569a95f0
|
提交2。0代码
|
2 years ago |
胡锐
|
34c626ee8d
|
提交代码
|
2 years ago |
袁野
|
9f92633130
|
提交2。0代码
|
2 years ago |
袁野
|
a0f8008517
|
提交2。0代码
|
2 years ago |
胡锐
|
50f8c1942e
|
提交代码
|
2 years ago |
胡锐
|
3998771ca3
|
提交代码
|
2 years ago |
胡锐
|
19c887b939
|
提交代码
|
2 years ago |
袁野
|
270be7cf13
|
Merge branch 'master' into 2.0-dev
* master:
修改配置星巴克 肯德基 会员充值 话费 微信商户号
修改配置星巴克 肯德基 会员充值 话费 微信商户号
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
# hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
|
2 years ago |
胡锐
|
868098a4b9
|
提交代码
|
2 years ago |
胡锐
|
a16f04a05c
|
提交代码
|
2 years ago |
袁野
|
ef68627087
|
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
|
2 years ago |
胡锐
|
a9bcd6800f
|
提交代码
|
2 years ago |
胡锐
|
1aaab689ba
|
提交代码
|
2 years ago |
袁野
|
c1ad172bae
|
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
|
2 years ago |
袁野
|
e5c17730ca
|
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
|
2 years ago |
胡锐
|
3ddcaff3ca
|
提交代码
|
2 years ago |
袁野
|
a42aef1fb0
|
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
|
2 years ago |
袁野
|
884daa1f39
|
提交代理商
|
2 years ago |
袁野
|
e5a0f9d777
|
1
|
2 years ago |
袁野
|
d908289faf
|
提交实物
|
2 years ago |
胡锐
|
01ba1de3d4
|
提交代码
|
2 years ago |
胡锐
|
d12bef55c3
|
提交代码
|
2 years ago |
胡锐
|
abb4fc1f57
|
提交代码
|
2 years ago |
胡锐
|
6120d54e1d
|
提交代码
|
2 years ago |
胡锐
|
8bb1e466c9
|
提交
|
2 years ago |
胡锐
|
389d7f4140
|
提交代码
|
2 years ago |
袁野
|
0128969970
|
1
|
2 years ago |