596 Commits (0ced285deac7787a9050d40634f71f578e765e30)

Author	SHA1	Message	Date
袁野	6bca0b0faa	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
袁野	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
袁野	90b5240651	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
袁野	884daa1f39	提交代理商	2 years ago
胡锐	2f73f9989f	提交代码	2 years ago
袁野	d908289faf	提交实物	2 years ago
袁野	66e2db5ec8	1	2 years ago
胡锐	abb4fc1f57	提交代码	2 years ago
胡锐	6120d54e1d	提交代码	2 years ago
袁野	3ed726289c	提交代码	2 years ago
胡锐	d063b9fe05	提交代码	2 years ago
胡锐	389d7f4140	提交代码	2 years ago
袁野	cf6f1d4c6a	1	2 years ago
袁野	40291a770d	修改首页没有积分专区	2 years ago
袁野	0e514bfc8f	修改首页没有积分专区	2 years ago
胡锐	8483d44a72	提交代码	2 years ago
袁野	3bbc59e4af	修改首页没有积分专区	2 years ago
袁野	88b6b96038	修改注册送券内容	2 years ago
袁野	9fa70087cd	修改注册送券内容	2 years ago
袁野	affbe9a6d9	1	2 years ago
胡锐	817797ee2e	提交代码	2 years ago
胡锐	d3f57a533b	提交代码	2 years ago
袁野	24832dbdf1	1	2 years ago
袁野	85659987ac	修改区域公司	2 years ago
胡锐	f95e0b92ea	提交代码	2 years ago
胡锐	fba9e3334d	提交代码	2 years ago
胡锐	f906a4dfb3	提交代码	2 years ago
袁野	684823d116	提交代码	2 years ago
胡锐	83a3e6661a	1	2 years ago
袁野	9efbeb61f9	修改区域公司	2 years ago
袁野	fde3db4fa8	修改区域公司	2 years ago
袁野	6a85d4a2f4	修改二维码	2 years ago
袁野	355a4c598d	no message	2 years ago
胡锐	42bc1db51d	提交代码	2 years ago
胡锐	9224c9c332	提交代码	2 years ago
胡锐	538c210ea6	提交代码	2 years ago
袁野	9b0e07f03c	1	2 years ago
袁野	15e1d89441	1	2 years ago
袁野	3ad6a64d70	1	2 years ago
袁野	624fcba567	修改区域公司	2 years ago
袁野	523fbe114e	修改区域公司	2 years ago
袁野	497a7a30af	修改区域公司	2 years ago
胡锐	87f22e4585	临时提交	2 years ago
袁野	1c8ce7bef3	修改区域公司	2 years ago
袁野	6a4aeaeaa7	1	2 years ago
袁野	51ba4959cc	修改区域公司	2 years ago
袁野	abcad5870d	1	2 years ago
袁野	072d61a722	修改话费定时任务问题	2 years ago
胡锐	a6ed9cff81	提交代码	2 years ago