185 Commits (2951172df3fd155d9a862260a746032eb2dddf4f)

Author	SHA1	Message	Date
胡锐	102f95a436	提交代码	2 years ago
胡锐	a16f04a05c	提交代码	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
胡锐	a9bcd6800f	提交代码	2 years ago
胡锐	bc6713e33b	提交代码	2 years ago
胡锐	e9ba049a32	提交代码	2 years ago
胡锐	4211df4a3b	提交代码	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
胡锐	3ddcaff3ca	提交代码	2 years ago
胡锐	3c5b3f545f	提交代码	2 years ago
胡锐	b90d56ed1e	提交代码	2 years ago
胡锐	6f07f5b2cb	提交代码	2 years ago
袁野	3bbc59e4af	修改首页没有积分专区	2 years ago
胡锐	58fbeb01ad	提交代码	2 years ago
胡锐	8effa3270b	提交代码	2 years ago
胡锐	52ec76f5a7	提交代码	2 years ago
袁野	f95ab26627	修改首页没有积分专区	2 years ago
胡锐	71ce3e468c	提交diam	2 years ago
袁野	88b6b96038	修改注册送券内容	2 years ago
胡锐	6ae301399f	提交代码	2 years ago
袁野	9fa70087cd	修改注册送券内容	2 years ago
胡锐	a3fb86d340	提交代码	2 years ago
胡锐	6b2692ac2d	提交代码	2 years ago
袁野	affbe9a6d9	1	2 years ago
胡锐	ed0fde9d99	提交代码	2 years ago
胡锐	f22e34bbf2	提交diam	2 years ago
袁野	3c00cb133f	1	2 years ago
胡锐	3115f9590a	提交代码	2 years ago
胡锐	c17032720e	提交代码	2 years ago
胡锐	aaeb3473ff	提交代码	2 years ago
袁野	c4fe67f5a8	1	2 years ago
胡锐	817797ee2e	提交代码	2 years ago
袁野	04d3aefab0	1	2 years ago
胡锐	70ce2b2526	提交代码	2 years ago
胡锐	d3f57a533b	提交代码	2 years ago
胡锐	c96a584877	提交代码	2 years ago
胡锐	73b7434ae6	提交代码	2 years ago
胡锐	ac9204492c	提交代码	2 years ago
胡锐	470061577e	提交代码	2 years ago
胡锐	f95e0b92ea	提交代码	2 years ago
胡锐	5672ab5cfa	提交代码	2 years ago
胡锐	538c210ea6	提交代码	2 years ago
袁野	d00e23c435	1	2 years ago
胡锐	74dd3f47bf	提交代码	2 years ago
胡锐	42dc475fb4	提交代码	2 years ago
胡锐	3cfe1aa378	提交代码	2 years ago
胡锐	84c1d6fbe1	提交代码	2 years ago
胡锐	e06b245562	提交代码	2 years ago
胡锐	b124eb007e	1	2 years ago
胡锐	87f22e4585	临时提交	2 years ago