25 Commits (0b4e1a06c204f79f805c53e3991a61ea39ee8c76)

Author	SHA1	Message	Date
袁野	198e338640	变更	1 year ago
袁野	1ac675b72b	变更	1 year ago
袁野	7f82edadf1	变更	1 year ago
袁野	ab1865ae7b	变更	1 year ago
袁野	0ced285dea	修改优惠券包赠送问题	2 years ago
胡锐	551cbd6504	提交代码	2 years ago
胡锐	9e79be27a5	提交代码	2 years ago
胡锐	8b01a10997	提交代码	2 years ago
胡锐	3df978ae80	提交代码	2 years ago
胡锐	bed8049c00	提交代码	2 years ago
胡锐	eda85fdd27	提交代码	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
胡锐	ce70828354	提交代码	2 years ago
胡锐	8993094a09	提交diam	2 years ago
胡锐	60a8a855cc	提交代码	2 years ago
胡锐	58b46af401	提交代码	2 years ago
袁野	de67f3c40c	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
胡锐	389d7f4140	提交代码	2 years ago
胡锐	940ac2fa6c	提交diam	2 years ago
胡锐	c539ecd7ef	提交代码	2 years ago
胡锐	c17032720e	提交代码	2 years ago
胡锐	817797ee2e	提交代码	2 years ago
胡锐	70ce2b2526	提交代码	2 years ago
胡锐	d3f57a533b	提交代码	2 years ago