1311 Commits (7f09e4bbf1cb3df2ad4fef91a5b2c3401cd01b55)

 

All Branches   

Search

Author	SHA1	Message	Date
袁野	7f09e4bbf1	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
胡锐	2f73f9989f	提交代码	2 years ago
胡锐	955c4e31e8	Merge branch 'master' of http://139.159.177.244:3000/hurui/hai-server	2 years ago
袁野	39af7f1c67	Merge branch 'dev_yy' ... * dev_yy: 1 提交代码 提交代码 提交代码 1 1 # Conflicts: # hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java # hai-user/target/classes/com/web/config/AuthConfig.class # hai-user/target/classes/com/web/controller/DiscountController.class # hai-user/target/hai-user-1.0-SNAPSHOT.jar # hai-user/target/hai-user-1.0-SNAPSHOT.jar.original # hai-user/target/maven-archiver/pom.properties # hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst # hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst	2 years ago
袁野	e5a0f9d777	1	2 years ago
袁野	45d1402bf3	Merge branch 'fleet_card' of http://139.159.177.244:3000/hurui/hai-server into activit	2 years ago
袁野	d908289faf	提交实物	2 years ago
胡锐	1cc0c7484e	提交代码	2 years ago
胡锐	01ba1de3d4	提交代码	2 years ago
胡锐	d12bef55c3	提交代码	2 years ago
袁野	fe0ac2dcf2	提交抽奖代码	2 years ago
袁野	66e2db5ec8	1	2 years ago
袁野	174c8fdb7e	提交代码	2 years ago
胡锐	abb4fc1f57	提交代码	2 years ago
胡锐	6120d54e1d	提交代码	2 years ago
袁野	70d5334e2a	提交代码	2 years ago
袁野	3ed726289c	提交代码	2 years ago
胡锐	d063b9fe05	提交代码	2 years ago
胡锐	8bb1e466c9	提交	2 years ago
袁野	a04ed18fb7	Merge remote-tracking branch 'origin/dev_yy' into dev_yy	2 years ago
袁野	0128969970	1	2 years ago
袁野	cf6f1d4c6a	1	2 years ago
袁野	36dd772b1c	修改首页没有积分专区	2 years ago
胡锐	cbfd795f5f	提交代码	2 years ago
袁野	93beb185cf	修改小程序注册用券	2 years ago
袁野	7cdc44424f	修改注册送券内容	2 years ago
袁野	b0b4584e63	修改注册送券内容	2 years ago
袁野	d5d37a5c70	修改注册送券内容	2 years ago
袁野	5fac98da6c	1	2 years ago
袁野	c76936275e	修改区域公司	2 years ago
袁野	d6981540f1	修改区域公司	2 years ago
袁野	2d55966453	修改区域公司	2 years ago
袁野	7f4dfda87a	1	2 years ago
袁野	6a85d4a2f4	修改二维码	2 years ago
袁野	d17a7b0b57	Merge branch 'master' into dev_yy ... * master: 提交微信小程序多次推送问题 no message 提交代码 提交代码 提交代码 1 1	2 years ago
袁野	ee366f9fbd	提交微信小程序多次推送问题	2 years ago
袁野	585f25a14f	提交修改	2 years ago
袁野	ace46b4beb	21	2 years ago
袁野	355a4c598d	no message	2 years ago
胡锐	72a3bbb787	提交代码	2 years ago
胡锐	42bc1db51d	提交代码	2 years ago
胡锐	0352cf0a0f	解决冲突	2 years ago
胡锐	9224c9c332	提交代码	2 years ago
袁野	9b0e07f03c	1	2 years ago
袁野	3aca2b3b0d	1	2 years ago
袁野	6d4259111b	提交代码修改	2 years ago
袁野	7ed5736e25	修改话费查询bug	2 years ago
袁野	b54c4e2678	修改星巴克下架问题	2 years ago
袁野	4178734953	提交代码	2 years ago
袁野	3ad6a64d70	1	2 years ago