Commit Graph

  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • * | |
  • | |/
  • |/|
  • * |
  • * |
  • | *
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • | *
  • * |
  • * |
  • | *
  • * |
  • * |
  • * |
  • 59823f7ec [卡券][修改]:场景发券数据汇总 by hupeng 2018-09-26 16:38:43 +0800
  • a6f2163fe [发券][修改]:场景发券类型整理 by hupeng 2018-09-26 14:47:36 +0800
  • d1f6c24f6 [用户管理][修复] by Stormeye.Wu 2018-09-26 14:36:53 +0800
  • b6e4580ae [营销系统][修改][数据倒序排列] by gongbiao 2018-09-26 12:42:47 +0800
  • e6b7254aa [标签短信][修改回调][发送短信时,添加回调,回调返回时,更新] by gongbiao 2018-09-26 11:34:10 +0800
  • b3f8c0f1b [用户管理/角色管理重整][重整]:只有超管才能添加删除用户,只有超管才能删除角色 by Stormeye.Wu 2018-09-26 10:56:12 +0800
  • 20ddd1811 [用户管理重整,角色管理重整][修复] by Stormeye.Wu 2018-09-26 09:47:49 +0800
  • 21f5ad544 [标签短信][回调][发送短信时,添加回调,回调返回时,更新] by gongbiao 2018-09-25 19:38:59 +0800
  • bf9ac2c6e [超级用户管理issue][修复] by Stormeye.Wu 2018-09-25 18:01:12 +0800
  • f305e0cf7 [标签短信][回调][回调时判断ID是否存在,存在更新,不存在插入] by gongbiao 2018-09-25 16:49:54 +0800
  • d5f64b475 [标签短信][回调][回调时判断ID是否存在,存在更新,不存在插入] by gongbiao 2018-09-25 16:49:10 +0800
  • 410d91cb1 [用户不能删除自己[修复] by Stormeye.Wu 2018-09-25 15:37:22 +0800
  • 8239ef4a0 [微信支付body超长处理][修复] by Stormeye.Wu 2018-09-25 14:04:39 +0800
  • 93bdd437f [Logger重整][重整] by Stormeye.Wu 2018-09-25 13:21:30 +0800
  • 5af5ac58e Merge tag 'refs/tags/jenkins-back-end-126' into release by Stormeye.Wu 2018-09-23 00:55:10 +0800
  • de373f90f [脏数据引发会员导出不工作][修复] by Stormeye.Wu 2018-09-23 00:47:35 +0800
  • cdaf01ef5 [会员导入优化][优化] by Stormeye.Wu 2018-09-23 00:36:44 +0800
  • 80b673ffe [ids处理rollback][重整] by Stormeye.Wu 2018-09-23 00:36:15 +0800
  • 74af83eb3 [短信][回调][恢复代码] by gongbiao 2018-09-22 22:48:43 +0800
  • 31b60ef12 [ids异常重整][重整]:如果ids为空不往下继续进行,避免sql异常出现 by Stormeye.Wu 2018-09-22 22:41:53 +0800
  • f98493413 [用户标签为空时异常修复][修复] by Stormeye.Wu 2018-09-22 22:28:10 +0800
  • 0cf8e4ffc [短信][回调][添加ID] by gongbiao 2018-09-22 22:22:33 +0800
  • 3de5fe3fc Merge commit 'refs/tags/jenkins-back-end-123^{}' into release by hupeng 2018-09-22 21:18:43 +0800
  • 852356a43 [标签短信][修复] by Stormeye.Wu 2018-09-22 21:14:03 +0800
  • cf5ac01db [标签短信][修复] by Stormeye.Wu 2018-09-22 21:10:31 +0800
  • 2f97b8ffc [成长值多租户支持][修复] by Stormeye.Wu 2018-09-22 13:57:19 +0800
  • 7283a60fe [appinfo空指针处理][修复] by Stormeye.Wu 2018-09-22 13:52:01 +0800
  • 8263601e7 [指定日志logging.path][新增]:日志命令行指定 by Stormeye.Wu 2018-09-21 17:02:50 +0800
  • f342c7eb0 [指定日志logging.path][新增]:日志命令行指定 by Stormeye.Wu 2018-09-21 16:48:46 +0800
  • 8629c3f4a Merge commit 'refs/tags/jenkins-back-end-117^{}' into release by hupeng 2018-09-21 15:59:21 +0800
  • 8ade4399c [用户名密码修改保存][修复] by Stormeye.Wu 2018-09-21 15:57:01 +0800
  • fb9795872 Merge commit 'refs/tags/jenkins-back-end-116^{}' into release by hupeng 2018-09-21 15:47:06 +0800
  • 268583749 [导入导出出错处理][修复] by Stormeye.Wu 2018-09-21 15:36:20 +0800
  • 0d2cd469a Merge commit 'refs/tags/jenkins-back-end-113^{}' into release by hupeng 2018-09-21 14:40:19 +0800
  • a010a9821 [A端][修复]:短信相关的列表排序问题 by hupeng 2018-09-21 13:18:58 +0800
  • 822b9d932 [营销系统][疲劳度设置] by gongbiao 2018-09-21 13:07:47 +0800
  • 0d6d838da [A端][修改]:精准发券列表排序和租户隔离 by hupeng 2018-09-21 12:15:13 +0800
  • 478b7fc45 [小程序note][新增]:新增小程序分享提示 by Stormeye.Wu 2018-09-21 11:57:01 +0800
  • 5d85614b3 [短信][添加枚举常量值] by gongbiao 2018-09-21 11:05:47 +0800
  • f9a84f524 [记录渠道][修复]:scene值记录 by Stormeye.Wu 2018-09-21 10:44:34 +0800
  • baa91c851 [退款log][整理] by Stormeye.Wu 2018-09-21 10:15:24 +0800
  • 058ea0284 [b端][修复]:不显示已被禁用管理员核销的券 by hupeng 2018-09-21 10:13:52 +0800
  • d0ee69b1a [退款回调支持][整理] by Stormeye.Wu 2018-09-21 01:29:02 +0800
  • d77839cbf Merge commit 'refs/tags/jenkins-back-end-110^{}' into release by hupeng 2018-09-20 23:18:07 +0800
  • ef4d5cb90 [A端][修复]:精准发券类型使用枚举 by hupeng 2018-09-20 23:15:08 +0800
  • 60e296c1b [修改==比较问题] by gongbiao 2018-09-20 22:54:41 +0800
  • 6e2ed83a8 [系统][修复]:发券比较条件问题 by hupeng 2018-09-20 22:51:58 +0800
  • 231368c21 [商户用户VALID/INVALID整理][整理] by Stormeye.Wu 2018-09-20 22:09:12 +0800
  • 6242a5c3c [订单导出修改][修复] by Stormeye.Wu 2018-09-20 21:35:24 +0800
  • 074af7fea [A端][修改]:Cuser微信渠道调整变量定义位置 by hupeng 2018-09-20 21:33:32 +0800
  • c7ca47ff7 [A端][修复]:PV,UV接口问题 by hupeng 2018-09-20 21:15:11 +0800
  • 6b472945f [成长值设定][新增] by Stormeye.Wu 2018-09-20 19:57:48 +0800
  • f0d327a8c [A端][修复]:用户tag过滤计数接口更改 by hupeng 2018-09-20 20:16:25 +0800
  • eb34aa72b [A端][修复]:人群tag计数接口问题 by hupeng 2018-09-20 19:29:28 +0800
  • 0f2937e7d [mall图标添加横版][新增] by Stormeye.Wu 2018-09-20 19:08:11 +0800
  • ba70ffee3 [性别初始化][新增] by Stormeye.Wu 2018-09-20 18:15:02 +0800
  • e1ed440fe [营销系统][营销统计][券数据][时间降序排列] by gongbiao 2018-09-20 18:09:11 +0800
  • 901c79713 [A端][修改]:会员系统相关接口升级 by hupeng 2018-09-20 18:06:12 +0800
  • d6e27b2e2 [会员列表导入][新增] by Stormeye.Wu 2018-09-20 17:35:13 +0800
  • 8085701f2 [商户商铺][商户][编辑回显商铺问题] by gongbiao 2018-09-20 16:27:24 +0800
  • 2b1dc7c85 [A端][修改]:会员首页接口更改适配最新会员概览前端 by hupeng 2018-09-20 16:05:04 +0800
  • a57466813 [scene入库][新增] by Stormeye.Wu 2018-09-20 14:51:40 +0800
  • fd0eef749 [验证码失效捕获][修复] by Stormeye.Wu 2018-09-20 14:47:33 +0800
  • c90965f4b [IdWork调用修改][重整] by Stormeye.Wu 2018-09-20 12:03:52 +0800
  • d7f96b3bc [数据塔台][运营数据/营销数据/车流数据][修改日期格式为MM/dd] by gongbiao 2018-09-20 14:32:08 +0800
  • 1e780ce11 [会员导入带标签][新增] by Stormeye.Wu 2018-09-19 23:51:46 +0800
  • fb22896aa [Tag修改][修复] by Stormeye.Wu 2018-09-19 22:42:38 +0800
  • 0c7c8e150 [用户ID同步][修复]:baseinfo与c_user ID同步,同时更新user_tag by Stormeye.Wu 2018-09-19 21:48:13 +0800
  • e2a648dc6 [tags去除tenantId][重整] by Stormeye.Wu 2018-09-19 20:55:01 +0800
  • b2bc0540e [AWS云端配置][新增] by Stormeye.Wu 2018-09-19 20:02:14 +0800
  • eb5335c32 [mall用户修改密码][修复]:mall用户修改密码 by Stormeye.Wu 2018-09-19 17:16:01 +0800
  • 35bb9622a [A端][新增]:获取mall信息接口 by hupeng 2018-09-19 16:01:45 +0800
  • f2d3a3063 [商户商铺][商户][修改绑定用户的状态] by gongbiao 2018-09-19 15:51:02 +0800
  • e6225a8b4 [商户商铺][商户][修改绑定用户的状态] by gongbiao 2018-09-19 15:49:07 +0800
  • 45b677a47 [商户商铺][商户][修改绑定用户的状态] by gongbiao 2018-09-19 15:46:50 +0800
  • 2b91ddfb7 [B端用户只取有效用户][新增] by Stormeye.Wu 2018-09-19 15:33:02 +0800
  • 0043c2f8e [支付检查商户信息][修复]:不存在或者已禁用商户不能购买 by Stormeye.Wu 2018-09-19 15:14:20 +0800
  • 857bd33be [会员][更改]:会员标签发短信和定向投放查找规则升级 by hupeng 2018-09-19 15:35:53 +0800
  • 40d6d545c [商户商铺][商户][释放商铺和商户管理员手机号码] by gongbiao 2018-09-19 14:50:40 +0800
  • c74d77dbd [会员系统][会员管理][添加日环比] by gongbiao 2018-09-19 14:23:38 +0800
  • 85658715f Merge tag 'refs/tags/jenkins-back-end-101' into release by Stormeye.Wu 2018-09-19 14:15:32 +0800
  • 24a1399d4 [会员信息][修复]:修复云及开发数据显示不一致问题 by Stormeye.Wu 2018-09-19 14:07:54 +0800
  • 2dd8658fd Merge commit 'refs/tags/jenkins-back-end-86^{}' into release by hupeng 2018-09-19 11:55:58 +0800
  • ff685f14d [upgrade common-lang3][整理] by Stormeye.Wu 2018-09-19 11:25:39 +0800
  • 7762a0d41 [短信][验证码][修改发送的逻辑] by gongbiao 2018-09-18 15:53:15 +0800
  • 7cefb96e3 [mall用户排序][修复] by Stormeye.Wu 2018-09-18 15:34:36 +0800
  • 11fdca2dc merge develop to release by Stormeye.Wu 2018-09-18 15:21:44 +0800
  • 64a78e478 [商户解单及商户商铺][整理] by Stormeye.Wu 2018-09-18 14:32:52 +0800
  • 79267827d [商户商铺][商户管理][修改常量值] by gongbiao 2018-09-18 14:34:27 +0800
  • 5b90df324 [商户用户整理][整理] by Stormeye.Wu 2018-09-18 14:00:43 +0800
  • 9cd1f2dd1 [shop的Enum整理][新增]:用enum代替shop的status by Stormeye.Wu 2018-09-18 13:33:34 +0800
  • 7bbeca4c5 com.simple -> com.iformall by Stormeye.Wu 2018-09-18 13:00:47 +0800
  • 35c8fe1fd [商户商铺][商户管理][停用后解绑商铺] by gongbiao 2018-09-18 11:04:55 +0800
  • 223634ddf merge for release by Stormeye.Wu 2018-09-17 22:58:40 +0800
  • a27839a56 [账号管理][用户管理][ID降序排列] by gongbiao 2018-09-17 22:07:37 +0800
  • cdab21b4f [退款回调][修复]:退款回调一直失败问题fix by Stormeye.Wu 2018-09-17 21:55:21 +0800
  • 05992d84a merge for release build by Stormeye.Wu 2018-09-17 20:02:55 +0800
  • df419d4d9 [数据塔台][客流数据][修改访问地址] by gongbiao 2018-09-17 16:37:43 +0800
  • 525c89d0b [卡券][修改]:增加一些错误代码定义,整理卡卷定向发送产生的一些错误 by hupeng 2018-09-15 11:54:31 +0800
  • b23f93ad3 [微信支付关单操作][新增]:过期检查自动关单,前端支付取消自动关单 by Stormeye.Wu 2018-09-14 23:52:01 +0800