Commit Graph

6909 Commits (da2dc09690d1b55ecc8f65d1c53e2fcfb41f8f08)
 

Author SHA1 Message Date
ELF b44a5118cf 修改
万盟天下 f7bd731ead Merge branch 'feature/testing_resource_admin' of wmtx/platform into master
测试资源功能提交
ELF 36c240c608 修改
万盟天下 b2098410a1 Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
测试资源发放
万盟天下 07a52d03d8 Merge branch 'hotfix/modify_special_piont' of wmtx/platform into master
特殊补点bug修正
zhengyongxing 68ba764d72 Merge branch 'hotfix/modify_special_piont' into feature/add_item
zhengyongxing d9b37792fd 特殊补点bug修正
zhengyongxing 6b47baf59a 汇总编辑前端修改
ELF ae3e49b95f 修改
ELF f77505925f 修改
ELF f3771dfd2d 修改
ELF a10bb888da 修改bug
zhengyongxing 4f35cacbab 汇总模板修改提交
ELF 36c4c666ec 修改bug
ELF 18c3e95f30 修改
ELF 8e4ba0e20e 修改
ELF c5fe80639f 修改
ELF 06bd640c79 修改
ELF 263e35c097 初步提交
廖金灵 fc15ee5537 Merge branch 'hotfix/close_334promote_recharge' of wmtx/platform into master
334充值隐藏
ELF 36c5b542ee Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/close_334promote_recharge
廖金灵 8eddb16558 Merge branch 'hotfix/close_334promote_recharge' of wmtx/platform into release
隐藏334充值
ELF b7104222a5 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/close_334promote_recharge
ELF f0d79c83a2 修改
廖金灵 662efdb613 Merge branch 'feature/add_item' of wmtx/platform into master
聚合结算单导出bug修正
zhengyongxing 3f90e1d9ee 汇总审批重算状态修正
zhengyongxing 723b3c9fa2 汇总重算提示语修正
zhengyongxing e7b64f27f2 汇总重算提示语修正
郑永星 8d37653db4 Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出公式添加
zhengyongxing ff46e189cc 聚合结算单导出公式添加
郑永星 a8c008923e Merge branch 'feature/add_item' of wmtx/platform into release
汇总导出bug修正
zhengyongxing 053e8acb8f 汇总导出bug修正
郑永星 6cbc8e0102 Merge branch 'feature/add_item' of wmtx/platform into release
聚合汇总导出bug修改
zhengyongxing 1f31244d10 聚合汇总导出bug修改
郑永星 37dd11369e Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出bug修正
zhengyongxing ac5c1a199c 聚合结算单导出bug修正
廖金灵 e916641647 Merge branch 'feature/add_item' of wmtx/platform into master
聚合结算单导出个人与公司导出不相同
郑永星 324f85759e Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出个人与公司导出不相同
zyx e1a88682f0 聚合结算单导出个人与公司导出不相同
郑永星 f283780233 Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出个人与公司导出不相同
zyx d44ac50ad1 聚合结算单导出个人与公司导出不相同
郑永星 e8ea849bdc Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出个人与公司导出不相同
zyx 01629c77ad 聚合结算单导出个人与公司导出不相同
郑永星 ac14a6be90 Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出个人与公司导出不相同
zyx 3db4fe1f60 聚合结算单导出个人与公司导出不相同
zyx b92ce713b3 聚合结算单上线
廖金灵 ef9a6d446b Merge branch 'feature/promote_level_sys' of wmtx/platform into master
游戏统计bug
ELF 2b1980bfbd 修改
廖金灵 51e3863b82 Merge branch 'feature/add_item' of wmtx/platform into master
导出公式添加
zhengyongxing f72bb66356 导出公式添加