Commit Graph

  • *
  • *
  • *
  • *
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • | | *
  • | | |\
  • | |_|/
  • |/| |
  • * | |
  • | | *
  • | | |\
  • | |_|/
  • |/| |
  • | | *
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • | | *
  • | | |\
  • | |_|/
  • |/| |
  • | | *
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • | | *
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • * | |
  • * | |
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • 628c9ce3f [上传导入异常][修改]:上传导入重设过期 by Stormeye Wu 2019-01-11 18:10:02 +0800
  • fd336b2f5 [上传导入异常][修改]:redis异常处理 by Stormeye Wu 2019-01-11 17:53:18 +0800
  • dd7441a70 [定时任务][修改][短信定时发送加入日志信息] by gongbiao 2019-01-11 15:52:11 +0800
  • 7f9eaaec7 [定时任务][修改][短信定时发送加入日志信息] by gongbiao 2019-01-11 15:49:12 +0800
  • 9101878a8 Merge tag 'refs/tags/jenkins-back-end-590' into release by Stormeye Wu 2019-01-11 03:27:17 +0800
  • 551968c3e [会员导入][修改]:异步快速返回前端结果 by Stormeye Wu 2019-01-11 03:21:21 +0800
  • 433e7f8d5 Merge commit 'refs/tags/jenkins-back-end-588^{}' into release by hupeng 2019-01-11 02:36:35 +0800
  • 1a610147c [A端][修复]:数据塔台B端支付列表问题 by hupeng 2019-01-11 02:34:00 +0800
  • e890a5cbc [A端][修复]:数据塔台B端支付列表问题 by hupeng 2019-01-11 02:27:39 +0800
  • d47f521bb Merge commit 'refs/tags/jenkins-back-end-585^{}' into release by hupeng 2019-01-11 00:37:11 +0800
  • 5e41b7aad [购券异常处理][修改] by Stormeye Wu 2019-01-11 00:33:20 +0800
  • 8fea218ea Merge commit 'refs/tags/jenkins-back-end-584^{}' into release by hupeng 2019-01-10 22:40:01 +0800
  • e6696d374 [TEST][修改]:TEST密码修改 by Stormeye Wu 2019-01-10 22:28:33 +0800
  • 2928cd748 [PROD][修改]:PROD密码修改 by Stormeye Wu 2019-01-10 22:25:29 +0800
  • f5ad9e356 Merge commit 'refs/tags/jenkins-back-end-582^{}' into release by hupeng 2019-01-10 22:15:52 +0800
  • 2398d38ad [PROD][修改]:PROD密码修改 by Stormeye Wu 2019-01-10 22:10:45 +0800
  • 96b224b8d [B端][修复]:当传入的卡券码格式不对时返回找不到卡券 by hupeng 2019-01-10 21:49:40 +0800
  • 661226985 [TEST][修改]:TEST密码修改 by Stormeye Wu 2019-01-10 21:47:59 +0800
  • f3bc217d4 Merge remote-tracking branch 'origin/develop' into develop by luozukai 2019-01-10 21:07:46 +0800
  • 9ae195f84 [DEV_DB][修改]:DEV DB密码修改 by Stormeye Wu 2019-01-10 20:53:38 +0800
  • b7e088a83 Merge remote-tracking branch 'origin/develop' into develop by luozukai 2019-01-10 20:43:22 +0800
  • 6954de8c9 开发审批流程 by luozukai 2019-01-10 20:43:07 +0800
  • c17218fac Merge tag 'refs/tags/jenkins-back-end-578' into release by Stormeye Wu 2019-01-10 19:24:36 +0800
  • 54a26310d [banner图][优化]:C端banner列表添加type by Stormeye Wu 2019-01-10 19:20:37 +0800
  • 9dde253d9 Merge tag 'refs/tags/jenkins-back-end-576' into release by Stormeye Wu 2019-01-10 19:02:39 +0800
  • 8b85348a2 [banner图][优化]:detail不需要html字段 by Stormeye Wu 2019-01-10 18:58:23 +0800
  • 5d5a0b4ed Merge commit 'refs/tags/jenkins-back-end-573^{}' into release by hupeng 2019-01-10 17:36:40 +0800
  • f722381f9 [banner图][优化]:list只返回相关信息,不需要html字段 by Stormeye Wu 2019-01-10 15:14:47 +0800
  • 13b9626a7 [EXCEPTION][修改]:扫码异常处理 by Stormeye Wu 2019-01-10 13:06:58 +0800
  • dbbb33a2b Merge tag 'refs/tags/jenkins-back-end-570' into release by Stormeye Wu 2019-01-10 11:16:41 +0800
  • 0abfd187c [从Controller层获取userId] by gongbiao 2019-01-10 10:54:54 +0800
  • e3713377a [会员列表][修改]: 并发导入数据不成功问题修复 by Stormeye Wu 2019-01-10 08:31:58 +0800
  • bfb625350 Merge commit 'refs/tags/jenkins-back-end-567^{}' into release by hupeng 2019-01-09 14:51:52 +0800
  • 526f6faf4 [BUG][1000780]:云端测试 version:.434.561:标签短信没有回调出发送结果 by gongbiao 2019-01-09 14:29:59 +0800
  • a966b1b04 [BUG][1000780]:云端测试 version:.434.561:标签短信没有回调出发送结果 by gongbiao 2019-01-09 13:21:18 +0800
  • 047849d93 [EXCEPTION处理][修改]:卡列表手机未填写异常处理 by Stormeye Wu 2019-01-09 13:51:59 +0800
  • 43ea2fa2b [exception][修复] by Stormeye Wu 2019-01-09 13:45:26 +0800
  • 44c61c752 [BUG][1000780]:云端测试 version:.434.561:标签短信没有回调出发送结果 by gongbiao 2019-01-09 11:46:30 +0800
  • de1c24882 Merge tag 'refs/tags/jenkins-back-end-563' into release by Stormeye Wu 2019-01-08 22:03:10 +0800
  • ee7f74d17 [补贴异常检测][修改]:通用券及储值卡补贴金额必填 by Stormeye Wu 2019-01-08 21:33:41 +0800
  • 38e0fc631 [扫码异常][修改]:扫码decode异常处理 by Stormeye Wu 2019-01-08 20:49:45 +0800
  • 2f4cdfef7 [A端会员列表导入][修复]:会员导入修复,会员导出修改 by Stormeye Wu 2019-01-08 20:27:11 +0800
  • fcb58afa5 [A端会员列表导入][修复]:会员导入修复 by Stormeye Wu 2019-01-08 19:38:23 +0800
  • 45494aee1 [A端会员列表导入][修复]:会员导入修复 by Stormeye Wu 2019-01-08 17:58:58 +0800
  • 6ba425c1e Merge commit 'refs/tags/jenkins-back-end-560^{}' into release by hupeng 2019-01-08 15:27:39 +0800
  • 17ebe204c Merge remote-tracking branch 'origin/develop' into develop by luozukai 2019-01-08 15:08:32 +0800
  • f8ad32d54 开发审批流程 by luozukai 2019-01-08 15:08:17 +0800
  • fcacc2366 [BUG][1000714]:redis初始数据问题 by Stormeye Wu 2019-01-08 14:45:43 +0800
  • d8b4ce028 [A端会员列表导出][优化]:admintest全部会员数据导出5s以内 by Stormeye Wu 2019-01-08 14:05:40 +0800
  • bde6f1e1e [B端收款码][修改]:添加api by Stormeye Wu 2019-01-08 13:08:30 +0800
  • 7814c6303 [BUG][1000736]:营销补贴导出 by Stormeye Wu 2019-01-08 12:43:08 +0800
  • 50f81ba6c [BUG][1000764]:限时抢购没有按时上架问题,A端时间条件过滤问题 by hupeng 2019-01-08 12:06:49 +0800
  • f5946c84b [C端扫B端][修改]:收款码解密 by Stormeye Wu 2019-01-08 11:43:44 +0800
  • 7e8b5ab05 [B端收款码加密][修改]:收款码加密 by Stormeye Wu 2019-01-08 11:32:48 +0800
  • 23c9abfe0 [云端测试 version:.426.552:营销统计-筛选问题] by gongbiao 2019-01-07 19:51:01 +0800
  • 52f87dc69 开发审批流程 by luozukai 2019-01-07 19:29:39 +0800
  • c9945b9c2 [BUG][1000749]:修复小程序营销数据的查询语句 by hupeng 2019-01-07 19:14:33 +0800
  • 0b00cb333 [BUG][1000758]:移除前端数据标记 by hupeng 2019-01-07 16:17:40 +0800
  • 71fe36513 [BUG][1000758]:移动端客流数据有效无效标记添加 by hupeng 2019-01-07 16:13:33 +0800
  • 1db07aaf1 [租赁合同][添加][合同类型] by gongbiao 2019-01-07 15:46:29 +0800
  • 373cd3328 [租赁合同][修改][补录生成账单] by gongbiao 2019-01-07 13:26:41 +0800
  • 675d45cda [车流][新增]:车流缴费回调,添加tenantId填充逻辑 by Stormeye Wu 2019-01-07 11:02:26 +0800
  • ab642418b [精准发券][修改][减库存] by gongbiao 2019-01-07 10:49:16 +0800
  • f5feced19 [会员列表][修改][导入失败提示] by gongbiao 2019-01-05 19:01:39 +0800
  • 47fd79920 [标签短信][修改][保存草稿] by gongbiao 2019-01-05 18:52:25 +0800
  • 0f9064331 [交易对账单][修改][查询问题] by gongbiao 2019-01-05 18:33:35 +0800
  • 3969e0094 Merge tag 'refs/tags/jenkins-back-end-551' into release by Stormeye Wu 2019-01-05 12:58:20 +0800
  • 49fb863bb [储值卡][修改]:储值卡支付更新order状态 by Stormeye Wu 2019-01-05 12:51:11 +0800
  • 52ab2b88c [储值卡][修改]:储值卡支付填写cUserId by Stormeye Wu 2019-01-05 12:44:17 +0800
  • 6409723ac [储值卡][修改]:过期与退款分离 by Stormeye Wu 2019-01-05 12:23:49 +0800
  • a9dc5e9a6 [会员列表][修改][导入时手机号检验] by gongbiao 2019-01-05 12:21:00 +0800
  • dcf12895b [会员列表][修改][导入] by gongbiao 2019-01-05 11:56:10 +0800
  • 93526c4cd [储值卡][移除]:卡支付订单不需要检查过期 by Stormeye Wu 2019-01-05 08:08:36 +0800
  • 9dc21b62b [储值卡][新增]:储值卡购买未支付检查 by Stormeye Wu 2019-01-04 23:51:56 +0800
  • d64f6bac0 [储值卡][新增]:储值卡购买未支付检查 by Stormeye Wu 2019-01-04 23:45:56 +0800
  • ad95a632f [coupon channel][移除]:移除无用的sql by Stormeye Wu 2019-01-04 22:30:18 +0800
  • 392dd7a3d [coupon补贴字段][修改] by Stormeye Wu 2019-01-04 22:29:11 +0800
  • b02bef77c [C端图片上传][修改]:上传文件名修改 by Stormeye Wu 2019-01-04 14:48:35 +0800
  • b3bc53644 [C端图片上传][修改]:添加过滤 by Stormeye Wu 2019-01-04 14:33:41 +0800
  • 3c895a5d8 Merge tag 'refs/tags/jenkins-back-end-543' into release by Stormeye Wu 2019-01-04 14:14:18 +0800
  • 05b1a74d3 [B端管理员][修改][密码字段] by gongbiao 2019-01-04 13:42:03 +0800
  • 2caea0e63 Merge tag 'refs/tags/jenkins-back-end-541' into release by Stormeye Wu 2019-01-04 11:49:26 +0800
  • 4064abf39 [券导出][修改]:券导出排序 by Stormeye Wu 2019-01-04 11:46:17 +0800
  • d03fa9259 [微信分账][修改]:分账金额为0,会导致无法分账 by Stormeye Wu 2019-01-04 11:29:36 +0800
  • 813e3f91e [卡消费列表][修改]:卡消费列表导出和UI界面一致 by Stormeye Wu 2019-01-04 11:05:29 +0800
  • 93e958ba9 [补贴][修改]:补贴导出和UI界面一致 by Stormeye Wu 2019-01-04 11:04:51 +0800
  • 01514b7e3 Merge tag 'refs/tags/jenkins-back-end-539' into release by Stormeye Wu 2019-01-03 15:03:51 +0800
  • ff3c9b51a [储值卡消费记录人工分账][修改] by Stormeye Wu 2019-01-03 14:52:04 +0800
  • d57aad9f8 [品牌][修改][保存前台传入的数据] by gongbiao 2019-01-03 13:27:53 +0800
  • 5a5d42eea [车流数据][修改][历史数据排序问题] by gongbiao 2019-01-03 12:41:31 +0800
  • 5edd8a999 [线程配置][添加][默认任务执行器] by gongbiao 2019-01-03 11:40:16 +0800
  • 52e0b8aa7 [收款码统计问题][修改]:添加订单状态过滤 by Stormeye Wu 2019-01-03 11:36:09 +0800
  • 3928baf74 [会员列表][修改][添加日志] by gongbiao 2019-01-03 10:56:03 +0800
  • a9b0b4a9e [储值卡完结接口][新增] by Stormeye Wu 2019-01-03 08:44:36 +0800
  • fad7b3e40 [无消费储值卡退款][新增] by Stormeye Wu 2019-01-03 08:44:14 +0800
  • c45299c1f [升级druid][升级] by Stormeye Wu 2019-01-02 22:40:16 +0800
  • 59d9eb657 [储值卡退卡][新增]:储值卡退卡退款逻辑添加 by Stormeye Wu 2019-01-02 22:39:43 +0800
  • dcead688e [交易对账单][修改][查询] by gongbiao 2019-01-02 19:44:28 +0800
  • 7f81159d3 [品牌][修改][创始时间回显] by gongbiao 2019-01-02 16:25:19 +0800
  • 760c53ec3 [会员列表][修改][成长值兑换] by gongbiao 2019-01-02 16:16:14 +0800