 袁野
|
81574f1b27
|
1
|
7 months ago |
|
袁野
|
42813d4068
|
Merge branch 'new-dev' into 2.0-dev
# Conflicts:
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderCreateHandleServiceImpl.java
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java
|
8 months ago |
|
袁野
|
54e0b04eb6
|
Merge branch 'new-dev' into 2.0-dev
# Conflicts:
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderCreateHandleServiceImpl.java
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java
|
8 months ago |
|
袁野
|
9f48149490
|
Merge branch 'new-dev' into 2.0-dev
# Conflicts:
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderCreateHandleServiceImpl.java
# hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java
|
10 months ago |
|
袁野
|
2172996361
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
c01f808c13
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
e90f4107cd
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
47eedd711e
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
d77c49c41e
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
11 months ago |
|
袁野
|
1308c0bebb
|
1
|
1 year ago |
|
袁野
|
88cd132792
|
1
|
1 year ago |
|
袁野
|
54a79af122
|
1
|
1 year ago |
|
袁野
|
de244978b6
|
变更
|
1 year ago |
|
袁野
|
3c2a156991
|
变更
|
1 year ago |
|
袁野
|
5487d5d6be
|
变更
|
1 year ago |
|
袁野
|
198e338640
|
变更
|
1 year ago |
|
袁野
|
1ac675b72b
|
变更
|
1 year ago |
|
袁野
|
71b0b145ef
|
修改话费
|
1 year ago |
|
袁野
|
f06272ddcc
|
修改优惠券包赠送问题
|
1 year ago |
|
袁野
|
ecb007c81e
|
提交实物代码
|
2 years ago |
|
袁野
|
19c7504036
|
提交实物代码
|
2 years ago |
|
袁野
|
d9644e41da
|
提交实物代码
|
2 years ago |
|
袁野
|
94ac746a72
|
提交实物代码
|
2 years ago |
|
袁野
|
0ea3d02eb0
|
提交实物代码
|
2 years ago |
|
袁野
|
c2babeab2f
|
提交实物代码
|
2 years ago |
|
袁野
|
4fe20c8f83
|
提交实物代码
|
2 years ago |
|
袁野
|
dd795a536a
|
修改对外接口可支持多个ip地址
|
2 years ago |
|
袁野
|
e25f2021a8
|
优化话费业务流程
|
2 years ago |
|
袁野
|
249e59b74b
|
优化话费定时任务代码
|
2 years ago |
 胡锐
|
3df978ae80
|
提交代码
|
2 years ago |
|
袁野
|
06013e1aae
|
1
|
2 years ago |
|
胡锐
|
bed8049c00
|
提交代码
|
2 years ago |
|
袁野
|
ff0c2b148f
|
优化话费定时任务代码
|
2 years ago |
|
袁野
|
ac8801bed3
|
优化话费定时任务代码
|
2 years ago |
|
袁野
|
03f9ca62a0
|
优化话费定时任务代码
|
2 years ago |
|
袁野
|
1adc37c728
|
优化话费定时任务代码
|
2 years ago |
|
袁野
|
c7fd02d5f4
|
提交2。0代码
|
2 years ago |
|
袁野
|
1b565faba0
|
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 |
|
袁野
|
10e65cc49c
|
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 |
|
袁野
|
66e2db5ec8
|
1
|
2 years ago |
|
袁野
|
70d5334e2a
|
提交代码
|
2 years ago |
|
袁野
|
3ed726289c
|
提交代码
|
2 years ago |
|
袁野
|
d5d37a5c70
|
修改注册送券内容
|
2 years ago |
|
袁野
|
5fac98da6c
|
1
|
2 years ago |
|
袁野
|
a665846035
|
1
|
2 years ago |
|
袁野
|
c76936275e
|
修改区域公司
|
2 years ago |
|
袁野
|
d6981540f1
|
修改区域公司
|
2 years ago |
|
袁野
|
2d55966453
|
修改区域公司
|
2 years ago |
|
袁野
|
daaef7efd5
|
修改区域公司
|
2 years ago |
