Commit Graph

  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • | *
  • | |\
  • * | |
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • * | |
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • 42bb26264 [POS][修改]:二维码生成 by Stormeye Wu 2019-08-09 16:16:35 +0800
  • f30b23310 [POS][修改]:事务修改 by Stormeye Wu 2019-08-08 20:35:32 +0800
  • 9c049ce28 [POS][修改]:事务修改 by Stormeye Wu 2019-08-08 20:33:45 +0800
  • e6dfab227 [POS][修改]:支付核销修改 by Stormeye Wu 2019-08-08 20:05:56 +0800
  • 539c09d40 [POS][修改]:删除无用的code by Stormeye Wu 2019-08-08 19:50:57 +0800
  • 6d2289d52 [POS][修改]:预核销/核销 by Stormeye Wu 2019-08-08 19:50:24 +0800
  • 82e39ed13 [POS][修改]:可用优惠券列表名修改 by Stormeye Wu 2019-08-08 14:52:46 +0800
  • b6df1f3ad [POS][修改]:log修改 by Stormeye Wu 2019-08-08 14:41:36 +0800
  • ccdd94593 [POS][修改]:code整理 by Stormeye Wu 2019-08-08 14:30:36 +0800
  • d93c645e6 [POS][修改]:核销取消支持强制 by Stormeye Wu 2019-08-08 09:29:52 +0800
  • 9f8c03f2d [POS][修改]:pos工程 by Stormeye Wu 2019-08-08 08:58:42 +0800
  • b4100b833 [POS][修改]:POS核销及核销取消 by Stormeye Wu 2019-08-08 08:57:56 +0800
  • f77f305ca [POS][修改]:POS核销及核销取消 by Stormeye Wu 2019-08-08 08:55:58 +0800
  • 968808f8b [成长值][修改]:成长值为0时,不记录 by Stormeye Wu 2019-08-08 07:19:14 +0800
  • 19b48bf09 [aws][新增]:s3 列出网盘文件 by Stormeye Wu 2019-08-08 07:16:43 +0800
  • c7a7e9a24 [POS][新增]:pos api添加 by Stormeye Wu 2019-08-08 07:16:11 +0800
  • 6c5c4c933 [商户][修改]:商户导出字段增加 by hupeng 2019-08-09 18:37:19 +0800
  • 639aa5524 [活动报名][修改][我要报名返回常见问题] by gongbiao 2019-08-09 17:09:05 +0800
  • 184b449c3 [活动报名][修改][字段] by gongbiao 2019-08-09 16:40:10 +0800
  • c796a70b2 [活动报名][修改][导出] by gongbiao 2019-08-09 16:26:10 +0800
  • 96f64f416 [活动报名][修改][添加字段及导出] by gongbiao 2019-08-09 16:17:44 +0800
  • 2fcd66cf4 [触达用户数][修改][导出] by gongbiao 2019-08-09 15:54:53 +0800
  • 090133590 [触达用户数][修改][导出] by gongbiao 2019-08-09 15:30:35 +0800
  • 682375d8c [触达用户数][修改][导出] by gongbiao 2019-08-09 15:13:46 +0800
  • 231e8a02d Merge commit 'd3907367d8241f89921708ac88a42e5e29ff08dd' into release by luozukai 2019-08-09 11:36:19 +0800
  • d3907367d [合同][修改][修改物业合同创建报错] by luozukai 2019-08-09 11:29:39 +0800
  • d644dc69d Merge tag 'refs/tags/jenkins-back-end-2439' into release by gongbiao 2019-08-08 16:55:57 +0800
  • b34f9ec39 [积分变更记录][修改][导出小票号] by gongbiao 2019-08-08 16:35:45 +0800
  • 7fca68cdd Merge commit 'cc8179b063fea8121851ba49c5310b23270099ea' into release by luozukai 2019-08-08 15:55:10 +0800
  • cc8179b06 [合同][修改][修改预账单计算逻辑] by luozukai 2019-08-08 15:40:37 +0800
  • 09cfbaff0 Merge tag 'refs/tags/jenkins-back-end-2435' into release by gongbiao 2019-08-08 14:06:45 +0800
  • 266ef8384 [账单][修改][导入之后的账单状态] by gongbiao 2019-08-08 13:59:37 +0800
  • 69b7e4d06 [电表][修复]:电表存储数据时的错误 by hupeng 2019-08-08 13:24:08 +0800
  • 89b07771a Merge tag 'refs/tags/jenkins-back-end-2432' into release by gongbiao 2019-08-08 13:22:44 +0800
  • 648fc6c17 [账单][修改][导入之后的账单状态] by gongbiao 2019-08-08 13:12:32 +0800
  • 0a9c8e5a9 Merge commit '5d1b71cbc99b632b170d2e0de469344ba07c3303' into release by luozukai 2019-08-08 11:51:20 +0800
  • 5d1b71cbc [合同][修改][修改预账单计算逻辑] by luozukai 2019-08-08 11:46:32 +0800
  • cbf14a77b Merge commit '7946b8842e5d463afa573a98a685b425a3f0f221' into release by luozukai 2019-08-08 10:36:50 +0800
  • 7946b8842 [审批][修改][修改获取billType数组转换] by luozukai 2019-08-08 10:31:30 +0800
  • 98a70192b [审批][修改][修改获取billType数组转换] by luozukai 2019-08-08 10:29:15 +0800
  • 8b24826c0 Merge tag 'refs/tags/jenkins-back-end-2426' into release by Stormeye Wu 2019-08-08 07:10:02 +0800
  • 47dff4b2d [停车][修改]:停车判断时间是否在15分钟内 by Stormeye Wu 2019-08-08 06:53:30 +0800
  • f82570c96 Merge commit 'd60c3345206749d7fb07d8f96f8ce60a200b5e55' into release by luozukai 2019-08-07 19:36:06 +0800
  • d60c33452 [合同][修改][修改预览账单生成逻辑] by luozukai 2019-08-07 19:27:37 +0800
  • a347030d7 [账单][修改][导入之后的账单状态] by gongbiao 2019-08-07 18:27:01 +0800
  • 88c35c60a Merge commit '15c974cc3a121ffb1df6ce0c644f054da125648f' into release by luozukai 2019-08-07 16:49:53 +0800
  • 15c974cc3 [合同][修改][修改预览账单生成逻辑] by luozukai 2019-08-07 16:13:01 +0800
  • 24ecf7a51 [账单][修改][查询逾期天数问题] by gongbiao 2019-08-07 16:01:08 +0800
  • c81e5942e [合同][修改][修改预览账单生成逻辑] by luozukai 2019-08-07 15:43:49 +0800
  • b5402cbef [合同][修改][修改预览账单生成逻辑] by luozukai 2019-08-07 15:40:00 +0800
  • aae453082 [合同][修改][修改预览账单生成逻辑] by luozukai 2019-08-07 14:56:02 +0800
  • e93e56bb2 Merge tag 'refs/tags/jenkins-back-end-2416' into release by gongbiao 2019-08-07 15:31:29 +0800
  • d0ad1b317 [账单][修改][导入时逾期天数问题] by gongbiao 2019-08-07 15:21:52 +0800
  • 1a78dc8e1 [电表][修复]:电表导入数字字段时报错问题 by hupeng 2019-08-06 19:03:16 +0800
  • b69be7923 Merge tag 'refs/tags/jenkins-back-end-2414' into release by gongbiao 2019-08-06 18:27:16 +0800
  • eb4bc7064 [电表][修复]:电表导入报错问题 by hupeng 2019-08-06 18:07:54 +0800
  • 492840e92 [电表][修复]:电表导入报错问题 by hupeng 2019-08-06 17:33:27 +0800
  • 06ef6419c Merge commit '5dfa466aa8c00bde068a65d5af7c379efa279c7e' into release by luozukai 2019-08-06 16:10:40 +0800
  • 5dfa466aa [审批][修改][修改合同审核状态] by luozukai 2019-08-06 15:57:14 +0800
  • dcc80dd67 [审批][修改][修改合同审核状态] by luozukai 2019-08-06 15:18:50 +0800
  • 6b0340234 [审批][修改][修改合同审核状态] by luozukai 2019-08-06 14:08:05 +0800
  • 86354ca7e Merge tag 'refs/tags/jenkins-back-end-2407' into release by gongbiao 2019-08-06 13:40:09 +0800
  • f1966f919 [电表][修复]:电表导入不能绑定采集器问题 by hupeng 2019-08-06 13:16:17 +0800
  • f9d16d60d [发券消息][修改]:发券消息分离 by Stormeye Wu 2019-08-06 11:49:30 +0800
  • 8c52c6766 Merge commit '32519d976443a604b9fbbde3d3c95ba29dcb0240' into release by luozukai 2019-08-06 11:19:59 +0800
  • 32519d976 [滞纳金][修改][修改滞纳金记录排序] by luozukai 2019-08-06 11:07:20 +0800
  • eb04067ba Merge commit '4ca4c2e6bfba2e742396fc2542f4bea44a7edb5b' into release by luozukai 2019-08-06 10:36:42 +0800
  • 5f78dc66d [积分成长值][修改]:达到门限值才给积分成长值 by Stormeye Wu 2019-08-06 10:30:30 +0800
  • 4ca4c2e6b [消息][修改][添加邮件模板开关] by luozukai 2019-08-06 10:19:42 +0800
  • 96d930fc9 Merge commit '6ba4fa7b6df3c8ac7b2160902249329d4c33c65d' into release by luozukai 2019-08-06 10:17:30 +0800
  • 6ba4fa7b6 [成长值历史][修改]:更新成长值不更新创建时间 by Stormeye Wu 2019-08-05 19:38:02 +0800
  • 626a2f4bb Merge tag 'refs/tags/jenkins-back-end-2401' into release by gongbiao 2019-08-05 19:22:33 +0800
  • a39615b06 [授权手机号][修改]:更新成长值和积分历史表 by Stormeye Wu 2019-08-05 19:15:41 +0800
  • eec762913 [C端消费卡][修改][支付时判断是否已下架,下架后卡不可转赠] by gongbiao 2019-08-05 19:08:15 +0800
  • 8b1c4c5c8 [授权手机号][修改]:第一次授权手机号,去掉积分补录功能 by Stormeye Wu 2019-08-05 17:08:41 +0800
  • b104c359a [C端消费卡][修改][支付时判断是否已下架,下架后卡不可转赠] by gongbiao 2019-08-05 17:07:11 +0800
  • 98cceb14b [会员ID][修改]:会员ID修改同步,成长值历史表、会员历史表同步 by Stormeye Wu 2019-08-05 16:55:40 +0800
  • 81d0df96b Merge tag 'refs/tags/jenkins-back-end-2395' into release by gongbiao 2019-08-05 14:25:22 +0800
  • fba0ef110 [C端消费卡][修改][下架或作废时可转赠状态] by gongbiao 2019-08-05 14:18:31 +0800
  • 0ac98e3a1 Merge tag 'refs/tags/jenkins-back-end-2393' into release by gongbiao 2019-08-05 12:02:26 +0800
  • 11dffd78b [C端消费卡][修改][下架或作废时可转赠状态] by gongbiao 2019-08-05 11:56:58 +0800
  • 10ba727ea Merge commit 'b8c753c0839fa6c0689a42daeed66deb8b17448e' into release by luozukai 2019-08-05 11:35:02 +0800
  • b8c753c08 [合同][修改][修改预账单生成逻辑] by luozukai 2019-08-05 11:22:43 +0800
  • 57c688c56 [合同][修改][修改预账单生成逻辑] by luozukai 2019-08-05 11:16:27 +0800
  • 4d8de6664 [C端消费卡][修改][下架或作废时可转赠状态] by gongbiao 2019-08-05 10:58:56 +0800
  • f1c6a5c3c [C端消费卡][修改][可转赠状态] by gongbiao 2019-08-03 18:38:33 +0800
  • e2c21b728 Merge commit '00095fe93968ead5211bc27391c722a4ef9ba178' into release by luozukai 2019-08-03 18:25:57 +0800
  • 00095fe93 [C端消费卡][修改][可转赠状态] by gongbiao 2019-08-03 18:19:44 +0800
  • 7d2374b92 [卡券][修复]:优化拼团统计数据 by hupeng 2019-08-03 18:18:06 +0800
  • 53ff27d32 [C端消费卡][修改][可转赠状态] by gongbiao 2019-08-03 18:07:36 +0800
  • a10458af5 [合同][修改][修改预账单生成逻辑] by luozukai 2019-08-03 17:37:49 +0800
  • adfa8567d Merge tag 'refs/tags/jenkins-back-end-2381' into release by gongbiao 2019-08-03 17:26:23 +0800
  • ed404e166 [C端消费卡][修改][可转赠状态] by gongbiao 2019-08-03 17:19:06 +0800
  • cb3a99783 [合同][修改][修改预账单生成逻辑] by luozukai 2019-08-03 17:08:25 +0800
  • a9d741f22 [合同][修改][修改预账单生成逻辑] by luozukai 2019-08-03 15:16:23 +0800
  • e4828f00d [合同][修改][修改预账单生成逻辑] by luozukai 2019-08-03 13:59:28 +0800
  • 84270e111 [C端首页][修改][换一换拼团与砍价] by gongbiao 2019-08-03 10:58:25 +0800
  • 764b9b93a [卡券][修复]:砍价统计数据错误修复 by hupeng 2019-08-03 10:51:18 +0800
  • 2415ae19d [卡券][修复]:优化砍价统计列表 by hupeng 2019-08-02 22:40:40 +0800
  • 60005acb6 Merge commit '21e6334a84ce98cf3aa86d1c79581c00bac97c8e' into release by luozukai 2019-08-02 19:16:49 +0800