37 Commits (3da4b9061e3f34b3e413b5f7e0466e977692c58b)

Author	SHA1	Message	Date
袁野	1b565faba0	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	2 years ago
袁野	10e65cc49c	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
袁野	884daa1f39	提交代理商	2 years ago
袁野	66e2db5ec8	1	2 years ago
袁野	70d5334e2a	提交代码	2 years ago
袁野	3ed726289c	提交代码	2 years ago
袁野	5fac98da6c	1	2 years ago
袁野	a665846035	1	2 years ago
袁野	c76936275e	修改区域公司	2 years ago
袁野	d6981540f1	修改区域公司	2 years ago
袁野	2d55966453	修改区域公司	2 years ago
袁野	daaef7efd5	修改区域公司	2 years ago
袁野	eac9c4008a	修改区域公司	2 years ago
袁野	6a85d4a2f4	修改二维码	2 years ago
袁野	585f25a14f	提交修改	2 years ago
袁野	ace46b4beb	21	2 years ago
袁野	2d8fdf4ee2	1	2 years ago
袁野	497a7a30af	修改区域公司	2 years ago
袁野	6a4aeaeaa7	1	2 years ago
袁野	072d61a722	修改话费定时任务问题	2 years ago
袁野	654718293c	修改话费定时任务问题	2 years ago
袁野	80f1ec3403	1	2 years ago
袁野	5121d06e06	修改话费定时任务问题	2 years ago
袁野	f93bbcac52	修改话费定时任务问题	2 years ago
胡锐	2b55ac1f44	提交代码	2 years ago
袁野	2ed7494790	合并代码	3 years ago
袁野	841e9285fd	提交修改	2 years ago
袁野	cebe26da2b	修改代码	2 years ago
袁野	0b60dfa57b	api需求上传	2 years ago
袁野	831e5c9c63	修改话费订单导出	2 years ago
袁野	2af7e3de5e	修改话费订单导出	2 years ago
袁野	b64efc9198	修改短信话术 修改 修改工会卡终端号	2 years ago
袁野	c7cf44ec80	修改短信话术 修改 修改工会卡终端号	2 years ago
袁野	80fbf4ae2a	合并话费修改	2 years ago