Commit Graph

  • 4efab5c479 新增定时任务查看 chenzhi 2021-07-14 17:59:57 +0800
  • df3b3ad4f8 优化编辑 chenzhi 2021-07-14 16:15:17 +0800
  • 65be8ad894 优化毛利数据 chenzhi 2021-07-14 11:27:43 +0800
  • 7993af7973 设定重算时间 chenzhi 2021-07-13 18:13:37 +0800
  • 85f7977d1a 新增月结每周一脚本 chenzhi 2021-07-13 18:13:17 +0800
  • 7d64738080 任务新增预约执行 chenzhi 2021-07-13 17:46:25 +0800
  • e61df7adc4 优化经理绩效统计 chenzhi 2021-07-13 17:02:54 +0800
  • 8c2f4f7edd 聚合代码关服更新 chenzhi 2021-07-13 16:33:12 +0800
  • 50b491d490 优化确认查询 chenzhi 2021-07-13 16:29:26 +0800
  • 2bbacb15a5 新增重算按钮提示 chenzhi 2021-07-12 18:03:38 +0800
  • 52e7f3059f 新增经理计算 chenzhi 2021-07-12 16:57:56 +0800
  • 9789da2aab 优化排序 chenzhi 2021-07-12 16:56:21 +0800
  • f8afea93f3 优化排序 chenzhi 2021-07-09 18:30:14 +0800
  • fb56f1ebe7 新增市场经理 chenzhi 2021-07-09 17:45:53 +0800
  • 59e5a01c18 Merge pull request '游戏返利' (#413) from feature/game_rebate into master 廖金灵 2021-07-09 13:58:03 +0800
  • 0f38a464ce 优化流水0显示 chenzhi 2021-07-08 18:30:36 +0800
  • 4c06f831b5 Merge pull request '修改' (#412) from feature/game_rebate into release 廖金灵 2021-07-08 15:35:48 +0800
  • 3b1aeaa632 修改 ELF 2021-07-08 15:34:22 +0800
  • b716846e0b Merge pull request '優化到處' (#411) from feature/game_rebate into release 廖金灵 2021-07-08 14:56:15 +0800
  • 95fea8fcf6 優化到處 ELF 2021-07-08 14:54:44 +0800
  • ce9d7b3fd2 Merge pull request '优化' (#410) from feature/game_rebate into release 廖金灵 2021-07-08 14:28:29 +0800
  • faf2fdc41f 优化 ELF 2021-07-08 14:27:01 +0800
  • 083c7710e4 Merge pull request '游戏返利' (#408) from feature/game_rebate into release 廖金灵 2021-07-08 14:07:44 +0800
  • 0d08c9c5fc 优化 ELF 2021-07-08 11:53:04 +0800
  • 0ea585bd96 游戏返利 ELF 2021-07-08 11:51:06 +0800
  • 3de4aa185a 新增市场经理 chenzhi 2021-07-07 17:00:33 +0800
  • 05dd251fec Merge pull request '新增判断结算包名' (#407) from feature/more_payment into master 廖金灵 2021-07-06 10:52:30 +0800
  • 91585e6ed4 新增判断结算包名 chenzhi 2021-07-06 10:49:37 +0800
  • 8b14d3c3b0 Merge pull request '优化毛利计算' (#406) from feature/more_payment into master 廖金灵 2021-07-06 10:21:08 +0800
  • c5c2f7fee3 优化毛利计算 chenzhi 2021-07-06 10:18:42 +0800
  • 81db2f512f Merge pull request 'release' (#405) from release into master 廖金灵 2021-07-02 18:02:29 +0800
  • 72d43e3150 Merge pull request 'feature/more_payment' (#404) from feature/more_payment into master 廖金灵 2021-07-02 18:01:10 +0800
  • 1e2d8035a2 优化人事 chenzhi 2021-07-02 17:57:38 +0800
  • a982732fdd Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment chenzhi 2021-07-02 17:57:19 +0800
  • 90b2cb4d9b 优化市场毛利 chenzhi 2021-07-02 17:56:22 +0800
  • 56a73931ea Merge pull request '公会信息默认沟通时间降序' (#403) from feature/wx_share into release 张谷成 2021-07-02 14:31:36 +0800
  • aea9d193e7 公会信息默认沟通时间降序 tping 2021-07-02 14:27:53 +0800
  • 3a905fcf59 优化数据生成 chenzhi 2021-07-02 13:51:16 +0800
  • 4ff9f76a5c 优化毛利统计 chenzhi 2021-07-02 11:00:42 +0800
  • f8609cdfbe Merge pull request '优化原包名获取' (#402) from hotfix/change_game_ration_org into master 廖金灵 2021-07-01 11:23:32 +0800
  • 5ce952ef1e 优化原包名获取 chenzhi 2021-07-01 11:21:52 +0800
  • 5ee21eb781 暂存 chenzhi 2021-07-01 11:14:01 +0800
  • 45885ad82a Merge pull request '版本更新' (#401) from release into master 廖金灵 2021-06-30 16:13:23 +0800
  • 073a9de21b Merge branch 'master' of 8.136.139.249:wmtx/platform into release ELF 2021-06-30 16:12:20 +0800
  • 50a0eab2f6 Merge pull request '商务汇总' (#400) from hotfix/remove_promote_package into master 廖金灵 2021-06-30 16:10:38 +0800
  • 5598437dce Merge pull request 'feature/wx_share' (#399) from feature/wx_share into release 张谷成 2021-06-30 11:05:33 +0800
  • 87e3de37c4 Merge pull request '设置权限、admin、市场总监可以看所有数据' (#398) from feature/wx_share into master 廖金灵 2021-06-30 10:37:47 +0800
  • f9b1501095 权限 tping 2021-06-30 10:35:26 +0800
  • d8b2a161af 权限 tping 2021-06-30 10:34:24 +0800
  • badb3bca31 设置权限、admin、市场总监可以看所有数据 tping 2021-06-29 16:31:13 +0800
  • 027a483aad Merge pull request '下载bug' (#397) from hotfix/remove_promote_package into release 廖金灵 2021-06-29 13:54:33 +0800
  • d1aff92c99 下载bug ELF 2021-06-29 13:52:12 +0800
  • 8b13de3e27 Merge pull request '添加奖金池总额' (#396) from hotfix/remove_promote_package into release 廖金灵 2021-06-29 13:48:14 +0800
  • 546abbfa72 添加奖金池总额 ELF 2021-06-29 13:46:43 +0800
  • 11a78d9094 Merge pull request 'hotfix/remove_promote_package' (#395) from hotfix/remove_promote_package into release 廖金灵 2021-06-28 16:07:05 +0800
  • 23ba2f3d3f Merge branch 'release' of 8.136.139.249:wmtx/platform into release ELF 2021-06-28 16:06:54 +0800
  • a2892d0491 Merge branch 'master' of 8.136.139.249:wmtx/platform into release ELF 2021-06-28 16:06:40 +0800
  • 556e3ba624 Merge branch 'master' of 8.136.139.249:wmtx/platform into hotfix/remove_promote_package ELF 2021-06-28 16:04:39 +0800
  • 1279cbfe3b 优化 ELF 2021-06-28 16:04:22 +0800
  • a027f6ad58 Merge pull request '优化首页' (#394) from feature/more_payment into master 廖金灵 2021-06-28 09:51:13 +0800
  • b156e22e83 优化首页 chenzhi 2021-06-28 09:49:44 +0800
  • 49b0ae3f14 Merge pull request '优化登陆' (#393) from feature/more_payment into master 廖金灵 2021-06-24 11:08:18 +0800
  • 541c4f47da 优化登陆 chenzhi 2021-06-24 11:06:28 +0800
  • ef15ac363a Merge pull request 'feature/more_payment' (#392) from feature/more_payment into master 廖金灵 2021-06-23 17:14:06 +0800
  • 4d3f1c04b8 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment chenzhi 2021-06-23 17:08:28 +0800
  • 1263383533 优化内团毛利计算公式 chenzhi 2021-06-23 17:08:17 +0800
  • 91701f3ecc Merge pull request '修复汇总导出' (#391) from feature/more_payment into master 廖金灵 2021-06-18 17:43:48 +0800
  • d6ea8057f0 修复汇总导出 chenzhi 2021-06-18 17:42:14 +0800
  • 82a40a79bd Merge pull request 'feature/more_payment' (#388) from feature/more_payment into master 廖金灵 2021-06-18 17:30:34 +0800
  • 84a6b21f88 Merge pull request '优化' (#390) from hotfix/remove_promote_package into master 廖金灵 2021-06-18 17:30:11 +0800
  • 9fb91c4a66 优化 ELF 2021-06-18 17:27:26 +0800
  • 9abd3896f7 新增提醒 chenzhi 2021-06-18 17:23:53 +0800
  • 626c63fe89 取消汇总不结算信息 chenzhi 2021-06-18 16:55:55 +0800
  • 497d3f8f61 优化计算及导出 chenzhi 2021-06-18 16:29:00 +0800
  • db28185af3 优化毛利统计方式 chenzhi 2021-06-18 16:21:00 +0800
  • ff7f2d7469 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment chenzhi 2021-06-16 15:05:06 +0800
  • d60330a093 新增商户支付导出 chenzhi 2021-06-16 14:58:53 +0800
  • 742bb493c1 Merge pull request 'hotfix/remove_promote_package' (#387) from hotfix/remove_promote_package into master 廖金灵 2021-06-11 14:13:53 +0800
  • 4e1cf805ea 优化 ELF 2021-06-11 14:12:34 +0800
  • e124f9caf3 Merge pull request 'hotfix/remove_promote_package' (#386) from hotfix/remove_promote_package into release 廖金灵 2021-06-11 14:02:15 +0800
  • 98c938c814 优化 ELF 2021-06-11 14:00:51 +0800
  • 78a24c78f5 优化 ELF 2021-06-11 13:58:07 +0800
  • 089b33958e Merge pull request '上游cp新增是否过期查询' (#384) from hotfix/underpay_bug into master 廖金灵 2021-06-09 18:13:52 +0800
  • fb86e08f69 Merge pull request 'hotfix/underpay_bug' (#385) from hotfix/underpay_bug into release 陈志 2021-06-09 18:09:58 +0800
  • 31fa1fcfc2 上游cp新增是否过期查询 chenzhi 2021-06-09 18:07:14 +0800
  • 839d287bf2 Merge pull request '毛利现在bug打印' (#383) from hotfix/underpay_bug into master 廖金灵 2021-06-08 18:27:45 +0800
  • 24e4f77a98 毛利现在bug打印 chenzhi 2021-06-08 18:22:50 +0800
  • 059cc12bcf Merge pull request 'hotfix/underpay_bug' (#382) from hotfix/underpay_bug into release 陈志 2021-06-08 15:27:08 +0800
  • d28fdfa7cf Merge pull request '新增打款确认优化' (#381) from hotfix/underpay_bug into master 廖金灵 2021-06-08 15:25:55 +0800
  • 4d8e7de144 新增打款确认优化 chenzhi 2021-06-08 15:20:19 +0800
  • 2d1da379b0 新增生效配置 chenzhi 2021-06-08 09:26:51 +0800
  • 8afbda9a1a Merge pull request 'feature/more_payment' (#380) from feature/more_payment into master 廖金灵 2021-06-04 15:00:06 +0800
  • 7e1bf58203 Merge pull request 'feature/more_payment' (#379) from feature/more_payment into release 陈志 2021-06-04 14:48:52 +0800
  • 79c52576c2 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment chenzhi 2021-06-04 14:42:34 +0800
  • 56fa287357 优化导出 chenzhi 2021-06-04 14:42:12 +0800
  • 648fb3ebbf 优化内部公司改进 chenzhi 2021-06-03 18:29:30 +0800
  • 4b1935676b 新增内外团查询 chenzhi 2021-06-03 17:55:41 +0800
  • e274f863a8 新增内部公司部门查询 chenzhi 2021-06-03 17:20:16 +0800
  • a0a1c5635e Merge pull request 'hotfix/remove_promote_package' (#378) from hotfix/remove_promote_package into master 廖金灵 2021-06-02 17:50:10 +0800
  • 9108b507b7 Merge pull request '优化' (#377) from hotfix/remove_promote_package into release 廖金灵 2021-06-02 17:47:59 +0800