|  袁野 | 7fe6800f9b | 提交2。0代码 | 3 years ago | 
				
					
						|  胡锐 | 5bba37bd0d | 提交代码 | 3 years ago | 
				
					
						|  袁野 | a3036c2a9b | 提交2。0代码 | 3 years ago | 
				
					
						|  袁野 | 59c01a9e48 | 提交2。0代码 | 3 years ago | 
				
					
						|  胡锐 | 1a9b3e311b | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 7de8bc2fc0 | 提交代码 | 3 years ago | 
				
					
						|  袁野 | 4a540ae44b | 提交2。0代码 | 3 years ago | 
				
					
						|  胡锐 | ea723f08f0 | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 0e602e3ace | 提交代码 | 3 years ago | 
				
					
						|  袁野 | 9f92633130 | 提交2。0代码 | 3 years ago | 
				
					
						|  胡锐 | 95c04aebaa | 提交代码 | 3 years ago | 
				
					
						|  袁野 | b19460705a | 提交2。0代码 | 3 years ago | 
				
					
						|  胡锐 | b46ffc67d7 | 提交代码 | 3 years ago | 
				
					
						|  袁野 | 898226866f | 提交2。0代码 | 3 years ago | 
				
					
						|  袁野 | a0f8008517 | 提交2。0代码 | 3 years ago | 
				
					
						|  胡锐 | 1dbe309b33 | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 50f8c1942e | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 79222cab93 | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 2ae18c0571 | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 7adb569d16 | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 8f5eb54e92 | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | ae015d378e | 提交代码 | 3 years ago | 
				
					
						|  袁野 | dbb9bfaa29 | 提交2。0代码 | 3 years ago | 
				
					
						|  胡锐 | 87eaa8ff5b | 提交代码 | 3 years ago | 
				
					
						|  袁野 | a4f1ba2e4b | 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 | 
				
					
						|  胡锐 | fba9665d6e | 提交diam | 3 years ago | 
				
					
						|  胡锐 | bc015c00c2 | 提交代码 | 3 years ago | 
				
					
						|  袁野 | db3341f13a | 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 | 
				
					
						|  胡锐 | 095c88d59a | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 60a8a855cc | 提交代码 | 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 | 
				
					
						|  袁野 | 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 | 3 years ago | 
				
					
						|  胡锐 | 0fb74a2e3f | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 2ff0fc63de | 提交diam | 3 years ago | 
				
					
						|  胡锐 | 102f95a436 | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | a16f04a05c | 提交代码 | 3 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 | 3 years ago | 
				
					
						|  胡锐 | a9bcd6800f | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | bc6713e33b | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | e9ba049a32 | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 4211df4a3b | 提交代码 | 3 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 | 3 years ago | 
				
					
						|  胡锐 | 3ddcaff3ca | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 3c5b3f545f | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | b90d56ed1e | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 6f07f5b2cb | 提交代码 | 3 years ago | 
				
					
						|  袁野 | 3bbc59e4af | 修改首页没有积分专区 | 3 years ago | 
				
					
						|  胡锐 | 58fbeb01ad | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 8effa3270b | 提交代码 | 3 years ago | 
				
					
						|  胡锐 | 52ec76f5a7 | 提交代码 | 3 years ago |