16 Commits (58b46af4017011d822f8d85f531434a1e3ce5e08)

Author	SHA1	Message	Date
袁野	4f93b703d6	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
胡锐	2ff0fc63de	提交diam	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
袁野	f95ab26627	修改首页没有积分专区	2 years ago
袁野	88b6b96038	修改注册送券内容	2 years ago
胡锐	aaeb3473ff	提交代码	2 years ago
胡锐	d3f57a533b	提交代码	2 years ago
胡锐	42dc475fb4	提交代码	2 years ago
胡锐	3cfe1aa378	提交代码	2 years ago
胡锐	e06b245562	提交代码	2 years ago
胡锐	87f22e4585	临时提交	2 years ago
胡锐	e4e226583e	提交代码	2 years ago
胡锐	dd0627e452	1	2 years ago
胡锐	38d1cfff3d	提交代码	3 years ago
199901012	dfacc3ad1d	初始化工程	4 years ago