Граф коммитов

  • *
  • |\
  • | *
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • | *
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • | *
  • | |\
  • | * |
  • * | |
  • | |/
  • |/|
  • * |
  • |\ \
  • | |/
  • | *
  • | *
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • | *
  • * |
  • * |
  • * |
  • |/
  • *
  • |\
  • | *
  • * |
  • * |
  • |/
  • *
  • |\
  • | *
  • * |
  • | *
  • * |
  • * |
  • |/
  • *
  • |\
  • | *
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • |/
  • *
  • *
  • *
  • |\
  • | *
  • * |
  • * |
  • * |
  • * |
  • * |
  • | *
  • | |\
  • * | |
  • | |/
  • |/|
  • | *
  • * |
  • * |
  • * |
  • |/
  • *
  • |\
  • | *
  • * |
  • * |
  • |/
  • *
  • *
  • *
  • *
  • *
  • |\
  • | *
  • * |
  • * |
  • | *
  • * |
  • * |
  • * |
  • * |
  • a37cb3ea7 Merge branch 'devlocal' into develop by Burce 2019-08-22 19:25:05 +0800
  • ece83a8be 商户注券->更新库存操作 by Burce 2019-08-22 19:22:19 +0800
  • 8eba71258 [POS][修改]:POS交易核销检查 by Stormeye Wu 2019-08-22 17:48:15 +0800
  • 770e7fc1f Merge branch 'develop' into devlocal by Burce 2019-08-22 19:03:02 +0800
  • 19112a545 商户注券->更新库存操作 by Burce 2019-08-22 19:02:21 +0800
  • e16da130f [合同][修改][开发账单结算] by luozukai 2019-08-22 18:55:36 +0800
  • 3c4287955 [POS][修改]:POS交易核销检查 by Stormeye Wu 2019-08-22 17:46:38 +0800
  • 8dac8446b [POS][修改]:POS交易预核销 by Stormeye Wu 2019-08-22 15:58:44 +0800
  • 2366d5a45 [POS][修改]:POS交易核销检查 by Stormeye Wu 2019-08-22 15:48:56 +0800
  • 2ded4f18f [POS][修改]:POS订单创建, POS会员识别 by Stormeye Wu 2019-08-22 15:32:07 +0800
  • 0c99f8b8b [日常账单][修改][B端显示] by gongbiao 2019-08-22 17:32:38 +0800
  • ed8977f53 [合同][修改][开发账单结算] by luozukai 2019-08-22 17:28:46 +0800
  • 20f11e8ee [账单对照][修改][账单列表查询] by gongbiao 2019-08-22 17:19:05 +0800
  • f8efbc7ec [日常账单][修改][添加电费明细] by gongbiao 2019-08-22 17:03:36 +0800
  • 3a94a8df3 [账单对账][修改][共用账单列表查询] by gongbiao 2019-08-22 16:48:46 +0800
  • d033a9ebb [合同][修改][开发账单结算] by luozukai 2019-08-22 16:47:35 +0800
  • 017779c64 [合同][修改][开发账单结算] by luozukai 2019-08-22 16:33:59 +0800
  • 7893cbed3 [合同][修改][开发账单结算] by luozukai 2019-08-22 16:19:49 +0800
  • ff223f00d [合同][修改][开发账单结算] by luozukai 2019-08-22 16:08:11 +0800
  • 72d83a5e8 [合同][修改][开发账单结算] by luozukai 2019-08-22 15:45:14 +0800
  • 67f141dbc Merge branch 'develop' into devlocal by Burce 2019-08-22 15:43:14 +0800
  • 3645193c0 Merge branch 'develop' into devlocal by Burce 2019-08-22 15:31:09 +0800
  • ad14aa009 根据商户过滤 by Burce 2019-08-22 15:30:59 +0800
  • ce0f5dc33 [合同][修改][开发账单结算] by luozukai 2019-08-22 14:56:18 +0800
  • d5f2abcf9 Merge branch 'devlocal' into develop by Burce 2019-08-22 14:49:15 +0800
  • 075bcbe51 商户注券->过滤商户信息 by Burce 2019-08-22 14:48:39 +0800
  • f65552fcf 商户注券->过滤商户信息 by Burce 2019-08-22 14:48:14 +0800
  • 9de1e1ac8 [POS][修改]:B端联调-POS券独立核销检查 by Stormeye Wu 2019-08-22 14:46:13 +0800
  • fda5ab7f0 [POS][修改]:B端联调-POS券独立核销检查 by Stormeye Wu 2019-08-22 14:45:34 +0800
  • 05982cc5c [合同][修改][开发账单结算] by luozukai 2019-08-22 14:42:37 +0800
  • eda8682a4 [电表管理][修改][定时任务] by gongbiao 2019-08-22 14:22:42 +0800
  • 813f3e531 [活动报名][修改][签到提示] by gongbiao 2019-08-22 14:00:59 +0800
  • 154c0100d [合同][修改][开发账单结算] by luozukai 2019-08-22 13:38:37 +0800
  • d803dfb12 [合同][修改][开发账单结算] by luozukai 2019-08-22 13:38:09 +0800
  • ce2b0212e [合同][修改][开发账单结算] by luozukai 2019-08-22 12:30:30 +0800
  • bf6b7e531 [合同][修改][开发账单结算] by luozukai 2019-08-22 11:17:00 +0800
  • edfa3cc90 [POS][修改]:POS订单及POS支付订单添加 by Stormeye Wu 2019-08-22 11:16:50 +0800
  • f0c3e6ad8 [POS][修改]:POS订单及POS支付订单添加 by Stormeye Wu 2019-08-22 11:12:40 +0800
  • 5c27fe874 [POS][修改]:POS订单及POS支付订单添加 by Stormeye Wu 2019-08-22 10:53:12 +0800
  • 75ed4f723 [电表管理][修改][B端显示] by gongbiao 2019-08-22 10:36:42 +0800
  • e5cd369e4 [POS][修改]:B端添加POS支持 by Stormeye Wu 2019-08-21 17:31:52 +0800
  • a579adea5 [POS][修改]:B端添加POS支持 by Stormeye Wu 2019-08-21 02:53:33 +0800
  • 104679b2b [合同][修改][开发账单结算] by luozukai 2019-08-21 16:45:28 +0800
  • 325ab34c4 商户注券->有效期过滤 by Burce 2019-08-21 16:25:07 +0800
  • 8f8b8d0bd [电表管理][修改][定时任务] by gongbiao 2019-08-21 15:17:13 +0800
  • 9259b0ad7 [合同][修改][开发账单结算] by luozukai 2019-08-21 14:51:48 +0800
  • f923dba16 [电表管理][修改][查询商户] by gongbiao 2019-08-21 14:32:45 +0800
  • 1fa7db789 Merge branch 'devlocal' into develop by Burce 2019-08-21 14:00:58 +0800
  • 0582c952c 商户注券->券库存更新 by Burce 2019-08-21 13:59:56 +0800
  • af2dbba39 [电表管理][修改][查询商户及定时任务] by gongbiao 2019-08-21 13:54:38 +0800
  • 2db54f129 [电表管理][修改][添加商户电表设置] by gongbiao 2019-08-21 12:00:51 +0800
  • bd6660027 Merge branch 'devlocal' into develop by Burce 2019-08-20 22:37:20 +0800
  • 66a27eae5 更新生日积分倍率计算 by Burce 2019-08-20 22:36:09 +0800
  • 87b7b7127 [合同][修改][开发账单结算] by luozukai 2019-08-20 20:03:28 +0800
  • 2183407bd 更新生日积分倍率计算 by Burce 2019-08-20 19:58:34 +0800
  • fb7a603e6 [POS][修改]:B端添加POS支持 by Stormeye Wu 2019-08-20 18:19:16 +0800
  • 271f6665d [合同][修改][开发账单结算] by luozukai 2019-08-20 17:50:51 +0800
  • 821c7247d Merge branch 'devlocal' into develop by Burce 2019-08-20 17:32:40 +0800
  • 8f965cae8 商户注券->卡券列表 接口更新 by Burce 2019-08-20 17:31:25 +0800
  • a313b8b57 [POS][修改]:B端修改 by Stormeye Wu 2019-08-20 17:24:25 +0800
  • 8e26f1d59 [POS][修改]:POS URL添加 by Stormeye Wu 2019-08-20 16:51:58 +0800
  • 09f309f1d [POS][修改]:POS接口添加 by Stormeye Wu 2019-08-20 16:45:30 +0800
  • cb790ef5f [POS][修改]:B用户登录检查 by Stormeye Wu 2019-08-20 15:13:08 +0800
  • 4900cf71f [电表管理][修改][定时任务] by gongbiao 2019-08-20 15:23:45 +0800
  • 2979290bf [电表管理][修改][字段问题] by gongbiao 2019-08-20 15:08:48 +0800
  • 0cad8fd21 [电表管理][修改][字段问题] by gongbiao 2019-08-20 14:45:50 +0800
  • cfed6eb6e [POS][修改]:B用户登录检查 by Stormeye Wu 2019-08-20 14:33:48 +0800
  • 56593d894 [POS][修改]:B用户登录检查 by Stormeye Wu 2019-08-20 09:54:23 +0800
  • b8da61bc0 [合同][修改][开发账单结算] by luozukai 2019-08-20 11:39:35 +0800
  • 22c719dba [电表管理][修改][初始值] by gongbiao 2019-08-19 21:24:32 +0800
  • be7fd88c9 Merge branch 'devlocal' into develop by Burce 2019-08-19 19:34:17 +0800
  • 1418e0abc 商户注券->卡券列表 by Burce 2019-08-19 19:33:13 +0800
  • 738ff78b1 [合同][修改][开发账单结算] by luozukai 2019-08-19 19:02:26 +0800
  • 6f5cac3c1 [合同][修改][开发账单结算] by luozukai 2019-08-19 17:42:41 +0800
  • d1f8f04f0 [合同][修改][开发账单结算] by luozukai 2019-08-19 17:09:59 +0800
  • 17f39dbb0 [合同][修改][开发账单结算] by luozukai 2019-08-19 17:03:22 +0800
  • a499b513b [合同][修改][开发账单结算] by luozukai 2019-08-19 17:01:10 +0800
  • 347b8cff0 Merge branch 'develop' into devlocal by Burce 2019-08-19 16:50:59 +0800
  • 2ceefb843 [电表管理][修改][路径名称] by gongbiao 2019-08-19 16:50:54 +0800
  • ef96158a4 商户注券->新建商户发券 by Burce 2019-08-19 16:50:00 +0800
  • e2d91dcb8 [电表管理][修改][定时任务] by gongbiao 2019-08-19 16:23:32 +0800
  • a05d0d11c [合同][修改][开发联营跳点设置] by luozukai 2019-08-19 15:33:13 +0800
  • 3876e00fc [合同][修改][开发联营跳点设置] by luozukai 2019-08-19 15:24:01 +0800
  • 7b9de97bb Merge branch 'devlocal' into develop by Burce 2019-08-19 14:55:23 +0800
  • ed43b3f78 调整会员生日券接口 by Burce 2019-08-19 14:54:16 +0800
  • 4cb5708b4 [电表详情][修改][查询] by gongbiao 2019-08-19 14:43:23 +0800
  • b2077dd72 [积分变更记录][修改][总积分显示] by gongbiao 2019-08-19 11:07:46 +0800
  • 2f31751c7 [POS][修改]:卡支付相关接口 by Stormeye Wu 2019-08-17 10:34:12 +0800
  • 15ea89fc6 [POS][修改]:test代码整理 by Stormeye Wu 2019-08-16 17:57:49 +0800
  • 41b3d0c11 [合同][修改][开发联营跳点设置] by luozukai 2019-08-16 18:54:39 +0800
  • 2d7886a31 更新生日积分定时任务发送短信 by Burce 2019-08-16 17:49:13 +0800
  • 6970aa1e7 Merge branch 'devlocal' into develop by Burce 2019-08-16 17:10:08 +0800
  • 6917c7218 添加生日积分定时任务发送短信 by Burce 2019-08-16 17:09:23 +0800
  • f55c7f0ca [POS][修改]:couponOrder新加核销类型字段 by Stormeye Wu 2019-08-16 16:23:22 +0800
  • 63d4626ed [POS][修改]:删除重复的sql by Stormeye Wu 2019-08-16 15:46:00 +0800
  • 4637e7af0 更新生日积分定时任务 by Burce 2019-08-16 15:35:58 +0800
  • 5eba7a80b [POS][修改]:卡支付取消 by Stormeye Wu 2019-08-16 15:09:26 +0800
  • 792501c3b [POS][修改]:卡预支付及预支付取消 by Stormeye Wu 2019-08-16 14:18:04 +0800
  • 4339f41cc [合同][修改][开发联营跳点设置] by luozukai 2019-08-16 13:34:51 +0800
  • 5cda0ed71 [POS][修改]:核销内部消息修改 by Stormeye Wu 2019-08-16 12:37:44 +0800