袁野
|
c2cefe0ea1
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
胡锐
|
fc611e2b22
|
提交代码
|
1 year ago |
袁野
|
5028901509
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
袁野
|
306610d94e
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
袁野
|
7c0bed1913
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
袁野
|
af238d45f0
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
袁野
|
2980280f1c
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
1 year ago |
袁野
|
1919c2fcd8
|
1
|
1 year ago |
袁野
|
95f98b2a21
|
1
|
2 years ago |
袁野
|
198e338640
|
变更
|
2 years ago |
胡锐
|
76a03b94f5
|
提交代码
|
2 years ago |
袁野
|
1ac675b72b
|
变更
|
2 years ago |
袁野
|
f388d88450
|
变更
|
2 years ago |
袁野
|
cea4c34719
|
修改话费
|
2 years ago |
袁野
|
717cbdcb0c
|
提交实物代码
|
2 years ago |
袁野
|
19c7504036
|
提交实物代码
|
2 years ago |
胡锐
|
a53bf3c552
|
提交代码
|
2 years ago |
胡锐
|
9e5cf88db9
|
提交代码
|
2 years ago |
袁野
|
d9644e41da
|
提交实物代码
|
2 years ago |
袁野
|
c2babeab2f
|
提交实物代码
|
2 years ago |
袁野
|
4fe20c8f83
|
提交实物代码
|
2 years ago |
袁野
|
3accfad213
|
提交实物代码
|
2 years ago |
袁野
|
e25f2021a8
|
优化话费业务流程
|
2 years ago |
袁野
|
302736a0c9
|
优化话费业务流程
|
2 years ago |
袁野
|
249e59b74b
|
优化话费定时任务代码
|
2 years ago |
袁野
|
06013e1aae
|
1
|
2 years ago |
胡锐
|
eda85fdd27
|
提交代码
|
2 years ago |
袁野
|
46ad424ee7
|
优化话费定时任务代码
|
2 years ago |
胡锐
|
58f5ec6bc5
|
提交代码
|
2 years ago |
袁野
|
ac8801bed3
|
优化话费定时任务代码
|
2 years ago |
袁野
|
2d13835ab0
|
优化话费定时任务代码
|
2 years ago |
袁野
|
c7fd02d5f4
|
提交2。0代码
|
2 years ago |
胡锐
|
44e3361d27
|
提交代码
|
2 years ago |
胡锐
|
7961dff622
|
提交代码
|
2 years ago |
袁野
|
59c01a9e48
|
提交2。0代码
|
2 years ago |
袁野
|
f288555163
|
11
|
2 years ago |
袁野
|
94569a95f0
|
提交2。0代码
|
2 years ago |
胡锐
|
95c04aebaa
|
提交代码
|
2 years ago |
袁野
|
a0f8008517
|
提交2。0代码
|
2 years ago |
胡锐
|
79222cab93
|
提交代码
|
2 years ago |
袁野
|
dfeeb2e945
|
提交2。0代码
|
2 years ago |
胡锐
|
2ae18c0571
|
提交代码
|
2 years ago |
袁野
|
8215f68730
|
提交2。0代码
|
2 years ago |
袁野
|
3da4b9061e
|
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 |
袁野
|
22d8ff4e84
|
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 |
袁野
|
db3341f13a
|
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 |
胡锐
|
0fb74a2e3f
|
提交代码
|
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 |
袁野
|
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 |
胡锐
|
4af688d7b2
|
提交代码
|
2 years ago |