4705 Commits (24ff7c21059c56c029ef58d7a9eb40b84118f4d4)

Author SHA1 Message Date
廖金灵 9d3d12d6f3 Merge pull request '有害' (#456) from feature/market_department_search into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/456
3 years ago
ELF 57f57b8a1d 有害 3 years ago
廖金灵 ce6134db6d Merge pull request '有害' (#455) from feature/market_department_search into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/455
3 years ago
ELF 23e03a4113 有害 3 years ago
廖金灵 4f457abcc6 Merge pull request '优化' (#454) from feature/market_department_search into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/454
3 years ago
tping c80609be77 小程序 3 years ago
ELF 69d1a0675d 优化 3 years ago
ELF 8f2fce9b98 优化 3 years ago
廖金灵 a874de5fe6 Merge pull request 'feature/game_rebate1' (#450) from feature/game_rebate1 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/450
3 years ago
ELF 82bc905b45 返利优化 3 years ago
ELF 79872573b9 优化 3 years ago
ELF ba3d1dadd2 优化 3 years ago
ELF b455770e42 优化 3 years ago
ELF 525c3012b2 yhg 3 years ago
廖金灵 881b9f91f8 Merge pull request '优化下游结算' (#444) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/444
3 years ago
chenzhi e39e02d970 优化下游结算 3 years ago
廖金灵 1d8e6984c8 Merge pull request 'feature/market_department_search' (#443) from feature/market_department_search into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/443
3 years ago
ELF d8357c072e 优化 3 years ago
ELF b231f1a50f 优化 3 years ago
chenzhi eb2db36c6b 优化特殊补点市场员查看 3 years ago
ELF 4c6116e840 优化 3 years ago
chenzhi 3b97aab1ed 优化绩效 3 years ago
chenzhi 4307c6afa8 优化允许绩效为0 3 years ago
ELF 82a70f0e05 优化 3 years ago
chenzhi bc19bec4b1 优化发放 3 years ago
chenzhi 83822e7952 定时任务删除 3 years ago
chenzhi 089390376c 优化周一定时器 3 years ago
ELF 1912e2b203 搜索 3 years ago
chenzhi 5224094042 优化充值查看 3 years ago
chenzhi 5bef7fb351 优化支付商户配置查看 3 years ago
chenzhi ad028cd613 优化显示 3 years ago
chenzhi 41f2234108 优化充值查看 3 years ago
chenzhi 34d07e1578 优化支付查看 3 years ago
ELF 55a14f9d46 优化玩家迁移 3 years ago
chenzhi 4f5fe04178 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 3 years ago
chenzhi 7b80101707 优化初始 3 years ago
chenzhi c234f9520b 优化获市场 3 years ago
chenzhi a9400d3c0b 优化订单显示 3 years ago
chenzhi 7d3dc9f8d2 优化公会押金权限 3 years ago
chenzhi 822894ea17 优化公会查看 3 years ago
chenzhi 5ccda517b3 优化公司查看 3 years ago
chenzhi acaf3ec370 优化公会信息权限 3 years ago
chenzhi e523dc7e88 游戏比例模板权限区分 3 years ago
chenzhi 22619dff0c 优化游戏比例申请 3 years ago
chenzhi c01b370405 优化获取公司不区分市场 3 years ago
chenzhi 2ddb07426a 优化取消部门领导 3 years ago
chenzhi 3d215d57aa 优化会长添加或者换绑引起的市场变化 3 years ago
chenzhi 39dcf64803 优化下游打款统计 3 years ago
chenzhi aae58f024b 优化添加会长 3 years ago
chenzhi e97d763bc8 优化权限 3 years ago
chenzhi 29e03a1718 优化市场部提成 3 years ago
chenzhi f66b7088e3 优化 3 years ago
chenzhi b0ac054745 新增公司筛选 3 years ago
chenzhi b679708156 优化市场业绩脚本 3 years ago
chenzhi 8ebecb5517 优化市场绩效脚本 3 years ago
chenzhi 5439bd2ee0 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 3 years ago
廖金灵 2c10246a4f Merge pull request 'feature/more_payment' (#418) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/418
3 years ago
廖金灵 0d0ea4259a Merge pull request 'feature/game_rebate' (#420) from feature/game_rebate into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/420
3 years ago
ELF b94a463d24 优化 3 years ago
chenzhi 4b28077e12 新增市场部部门显示 3 years ago
ELF 69922e73a1 有害 3 years ago
chenzhi c89d1540e7 新增初始化数据 3 years ago
chenzhi b1ee5b0f4f 优化市场部毛利按实际换绑时间计算 3 years ago
廖金灵 2065d8c353 Merge pull request 'feature/more_payment' (#415) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/415
3 years ago
chenzhi f5f20300c7 新增离职后无需确认绩效 3 years ago
chenzhi 5fbe327cba 新增备注 3 years ago
chenzhi c549cc703e 新增线下打款导出 3 years ago
chenzhi 4efab5c479 新增定时任务查看 3 years ago
chenzhi df3b3ad4f8 优化编辑 3 years ago
chenzhi 65be8ad894 优化毛利数据 3 years ago
chenzhi 7993af7973 设定重算时间 3 years ago
chenzhi 85f7977d1a 新增月结每周一脚本 3 years ago
chenzhi 7d64738080 任务新增预约执行 3 years ago
chenzhi e61df7adc4 优化经理绩效统计 3 years ago
chenzhi 8c2f4f7edd 聚合代码关服更新 3 years ago
chenzhi 50b491d490 优化确认查询 3 years ago
chenzhi 2bbacb15a5 新增重算按钮提示 3 years ago
chenzhi 52e7f3059f 新增经理计算 3 years ago
chenzhi 9789da2aab 优化排序 3 years ago
chenzhi f8afea93f3 优化排序 3 years ago
chenzhi fb56f1ebe7 新增市场经理 3 years ago
chenzhi 0f38a464ce 优化流水0显示 3 years ago
ELF 3b1aeaa632 修改 3 years ago
ELF 95fea8fcf6 優化到處 3 years ago
ELF faf2fdc41f 优化 3 years ago
ELF 0ea585bd96 游戏返利 3 years ago
chenzhi 3de4aa185a 新增市场经理 3 years ago
廖金灵 05dd251fec Merge pull request '新增判断结算包名' (#407) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/407
3 years ago
chenzhi 91585e6ed4 新增判断结算包名 3 years ago
廖金灵 8b14d3c3b0 Merge pull request '优化毛利计算' (#406) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/406
3 years ago
chenzhi c5c2f7fee3 优化毛利计算 3 years ago
廖金灵 81db2f512f Merge pull request 'release' (#405) from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/405
3 years ago
chenzhi 1e2d8035a2 优化人事 3 years ago
chenzhi a982732fdd Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 3 years ago
chenzhi 90b2cb4d9b 优化市场毛利 3 years ago
张谷成 56a73931ea Merge pull request '公会信息默认沟通时间降序' (#403) from feature/wx_share into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/403
3 years ago
tping aea9d193e7 公会信息默认沟通时间降序 3 years ago
chenzhi 3a905fcf59 优化数据生成 3 years ago
chenzhi 4ff9f76a5c 优化毛利统计 3 years ago
chenzhi 5ce952ef1e 优化原包名获取 3 years ago
chenzhi 5ee21eb781 暂存 3 years ago
廖金灵 50a0eab2f6 Merge pull request '商务汇总' (#400) from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/400
3 years ago
张谷成 5598437dce Merge pull request 'feature/wx_share' (#399) from feature/wx_share into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/399
3 years ago
tping f9b1501095 权限 3 years ago
tping d8b2a161af 权限 3 years ago
tping badb3bca31 设置权限、admin、市场总监可以看所有数据 3 years ago
ELF d1aff92c99 下载bug 3 years ago
ELF 546abbfa72 添加奖金池总额 3 years ago
ELF 556e3ba624 Merge branch 'master' of 8.136.139.249:wmtx/platform into hotfix/remove_promote_package 3 years ago
ELF 1279cbfe3b 优化 3 years ago
chenzhi b156e22e83 优化首页 3 years ago
chenzhi 541c4f47da 优化登陆 3 years ago
chenzhi 4d3f1c04b8 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 3 years ago
chenzhi 1263383533 优化内团毛利计算公式 3 years ago
廖金灵 91701f3ecc Merge pull request '修复汇总导出' (#391) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/391
3 years ago
chenzhi d6ea8057f0 修复汇总导出 3 years ago
廖金灵 82a40a79bd Merge pull request 'feature/more_payment' (#388) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/388
3 years ago
廖金灵 84a6b21f88 Merge pull request '优化' (#390) from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/390
3 years ago
ELF 9fb91c4a66 优化 3 years ago
chenzhi 9abd3896f7 新增提醒 3 years ago
chenzhi 626c63fe89 取消汇总不结算信息 3 years ago
chenzhi 497d3f8f61 优化计算及导出 3 years ago
chenzhi db28185af3 优化毛利统计方式 3 years ago
chenzhi ff7f2d7469 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 3 years ago
chenzhi d60330a093 新增商户支付导出 3 years ago
chenzhi 31fa1fcfc2 上游cp新增是否过期查询 3 years ago
chenzhi 24e4f77a98 毛利现在bug打印 3 years ago
chenzhi 4d8e7de144 新增打款确认优化 3 years ago
chenzhi 2d1da379b0 新增生效配置 3 years ago
chenzhi 79c52576c2 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 4 years ago
chenzhi 56fa287357 优化导出 4 years ago
chenzhi 648fb3ebbf 优化内部公司改进 4 years ago
chenzhi 4b1935676b 新增内外团查询 4 years ago
chenzhi e274f863a8 新增内部公司部门查询 4 years ago
廖金灵 a0a1c5635e Merge pull request 'hotfix/remove_promote_package' (#378) from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/378
4 years ago
ELF 6d5d40dfd2 优化 4 years ago
ELF d6efc36e9a 优化 4 years ago
廖金灵 642bcefd59 Merge pull request 'hotfix/remove_promote_package' (#375) from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/375
4 years ago
ELF 53bf6bca07 优化 4 years ago
ELF b8de662556 优化 4 years ago
chenzhi c36ce00b60 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 4 years ago
chenzhi c4849ffc7c 新增商户固定 4 years ago
廖金灵 f568c40e22 Merge pull request '金额错误bug修改' (#363) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/363
4 years ago
zhengyongxing b1c82bfd69 金额错误bug修改 4 years ago
zhengyongxing b58bdab705 金额错误bug修改 4 years ago
廖金灵 9e44ad5fe3 Merge pull request '5.27新功能时间修改' (#362) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/362
4 years ago
zhengyongxing a4bf7ff108 5.27新功能时间修改 4 years ago
廖金灵 cd33286900 Merge pull request '优化导出错误' (#361) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/361
4 years ago
chenzhi ad49a9a419 优化导出错误 4 years ago
廖金灵 f5e42522bf Merge pull request 'feature/more_payment' (#359) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/359
4 years ago
chenzhi f211fe6fa7 优化批量导出 4 years ago
廖金灵 bba10a23b1 Merge pull request '5.27新功能上线' (#358) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/358
4 years ago
zhengyongxing 8abf4e4eb8 5.27新功能上线 4 years ago
chenzhi 3b725f9c1d 新增汇总查看 4 years ago
chenzhi db0d49fe4b 优化合并查看 4 years ago
廖金灵 f556d7889e Merge pull request '修改' (#357) from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/357
4 years ago
郑永星 6b10bc1b05 Merge pull request '5.26功能上线' (#355) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/355
4 years ago
zhengyongxing 0c5dfdebf9 5.26功能上线 4 years ago
chenzhi e95087060a 优化上游逻辑 4 years ago
chenzhi 6df1f871f2 优化设置后的其他比例问题 4 years ago
陈志 a0c9d6e7a9 Merge pull request 'hotfix/change_pay_0526' (#353) from hotfix/change_pay_0526 into release
优化名称
4 years ago
chenzhi 543fc37ba2 优化名称 4 years ago
郑永星 24728cf1ec Merge pull request '5.26功能上线' (#352) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/352
4 years ago
zhengyongxing e710d5a710 5.26功能上线 4 years ago
chenzhi 7f9d2e3c97 优化类大小写 4 years ago
chenzhi 811587a33f 优化导出不和重算关联 4 years ago
陈志 a187b17cdd Merge pull request 'feature/more_payment' (#349) from feature/more_payment into release
优化上游比例
4 years ago
chenzhi 7aa29e8f3f 优化每月计算及导出 4 years ago
chenzhi 1728886f1f 优化上游比例 4 years ago
chenzhi 06f5882107 格式化数据 4 years ago
zhengyongxing 123ee98c59 5.26功能上线 4 years ago
zhengyongxing 5aeff6e3f2 5.26功能上线 4 years ago
zhengyongxing 7265ddd23e 5.26功能上线 4 years ago
chenzhi 9631a26d40 优化结算 4 years ago
郑永星 fcf3e09c1b Merge pull request '5.26功能上线' (#344) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/344
4 years ago
zhengyongxing 4f0bad5c45 5.26功能上线 4 years ago
chenzhi 013801556a 新增游戏分成比例操作时间 4 years ago
chenzhi fd285df021 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 4 years ago
chenzhi 2ac55db936 优化导出名称 4 years ago
chenzhi 3dca998277 优化权限 4 years ago
chenzhi f269a3a961 优化导出 4 years ago
chenzhi 78b85d9b37 新增导出 4 years ago
chenzhi 365faa99a7 新增重算功能 4 years ago
chenzhi 7caaf75647 优化编辑和重算 4 years ago
chenzhi 34b30c70f6 新增编辑功能 4 years ago
廖金灵 3edcb05ed9 Merge pull request '比例体系修改' (#340) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/340
4 years ago
zhengyongxing e7c83a2811 比例体系修改 4 years ago
廖金灵 daca7679ad Merge pull request '比例体系修改' (#339) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/339
4 years ago
chenzhi cf06897d66 新增游戏毛利表 4 years ago
zhengyongxing 9c2c771be9 比例体系修改 4 years ago
廖金灵 af92816205 Merge pull request '比例体系修改' (#338) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/338
4 years ago
zhengyongxing 8749beec32 比例体系修改 4 years ago
廖金灵 eec3495340 Merge pull request '有害' (#334) from feature/op_player_shift into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/334
4 years ago
张谷成 d254e7be32 Merge pull request '0521' (#333) from feature/company0521 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/333
4 years ago
ELF 450c8e517b 有害 4 years ago
tping 7b694b2fc8 0521 4 years ago
廖金灵 95da7866d1 Merge pull request 'feature/op_player_shift' (#332) from feature/op_player_shift into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/332
4 years ago
ELF 90d82b1a8d 有害 4 years ago
ELF 8440c5d384 优化 4 years ago
郑永星 b603435c8f Merge pull request 'feature/add_item' (#331) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/331
4 years ago