|  胡锐 | ae015d378e | 提交代码 | 3 years ago | 
				
					
						|  袁野 | 72990cc592 | 提交2。0代码 | 3 years ago | 
				
					
						|  胡锐 | 20ba3e7a89 | 提交代码 | 3 years ago | 
				
					
						|  袁野 | 22d8ff4e84 | 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 | 3 years ago | 
				
					
						|  袁野 | 0c895fc92b | 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 | 3 years ago | 
				
					
						|  袁野 | f5c70d53ca | 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 | 3 years ago | 
				
					
						|  胡锐 | 60a8a855cc | 提交代码 | 3 years ago | 
				
					
						|  袁野 | 1ce4165adc | 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 | 3 years ago | 
				
					
						|  袁野 | 270be7cf13 | 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 | 3 years ago | 
				
					
						|  袁野 | 51b9c975c6 | 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 | 3 years ago | 
				
					
						|  胡锐 | a9bcd6800f | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 1aaab689ba | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 4af688d7b2 | 提交代码 | 3 years ago | 
				
					
						|  袁野 | 68c1108434 | 2 | 3 years ago | 
				
					
						|  袁野 | 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 | 3 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 | 3 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 | 3 years ago | 
				
					
						|  胡锐 | 3ddcaff3ca | 提交代码 | 3 years ago | 
				
					
						|  袁野 | 884daa1f39 | 提交代理商 | 3 years ago | 
				
					
						|  胡锐 | 2f73f9989f | 提交代码 | 3 years ago | 
				
					
						|  袁野 | d908289faf | 提交实物 | 3 years ago | 
				
					
						|  袁野 | fe0ac2dcf2 | 提交抽奖代码 | 3 years ago | 
				
					
						|  袁野 | 66e2db5ec8 | 1 | 3 years ago | 
				
					
						|  胡锐 | abb4fc1f57 | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 6120d54e1d | 提交代码 | 3 years ago | 
				
					
						|  袁野 | 3ed726289c | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | d063b9fe05 | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 389d7f4140 | 提交代码 | 3 years ago | 
				
					
						|  袁野 | cf6f1d4c6a | 1 | 3 years ago | 
				
					
						|  袁野 | 40291a770d | 修改首页没有积分专区 | 3 years ago | 
				
					
						|  袁野 | 0e514bfc8f | 修改首页没有积分专区 | 3 years ago | 
				
					
						|  胡锐 | 8483d44a72 | 提交代码 | 3 years ago | 
				
					
						|  袁野 | 3bbc59e4af | 修改首页没有积分专区 | 3 years ago | 
				
					
						|  袁野 | 88b6b96038 | 修改注册送券内容 | 3 years ago | 
				
					
						|  袁野 | 9fa70087cd | 修改注册送券内容 | 3 years ago | 
				
					
						|  袁野 | affbe9a6d9 | 1 | 3 years ago | 
				
					
						|  胡锐 | 817797ee2e | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | d3f57a533b | 提交代码 | 3 years ago | 
				
					
						|  袁野 | 24832dbdf1 | 1 | 3 years ago | 
				
					
						|  袁野 | 85659987ac | 修改区域公司 | 3 years ago | 
				
					
						|  胡锐 | f95e0b92ea | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | fba9e3334d | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | f906a4dfb3 | 提交代码 | 3 years ago | 
				
					
						|  袁野 | 684823d116 | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 83a3e6661a | 1 | 3 years ago | 
				
					
						|  袁野 | 9efbeb61f9 | 修改区域公司 | 3 years ago | 
				
					
						|  袁野 | fde3db4fa8 | 修改区域公司 | 3 years ago | 
				
					
						|  袁野 | 6a85d4a2f4 | 修改二维码 | 3 years ago | 
				
					
						|  袁野 | 355a4c598d | no message | 3 years ago | 
				
					
						|  胡锐 | 42bc1db51d | 提交代码 | 3 years ago |