Commit Graph

6682 Commits (36c240c608e173c87ed7b1b3c18719cd5083ed09)
 

Author SHA1 Message Date
ELF 050eb98843 xiugai
万盟天下 19cd57c354 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
修改
ELF 2c9092273f 修改
万盟天下 ae44e80233 Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点与其他汇总重算功能区分添加限制
zhengyongxing 7a04411e4d 特殊补点与其他汇总重算功能区分添加限制
万盟天下 e130228c39 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
万盟天下 2f0ecf6302 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
修改bug
ELF 8f4b86ee2e 优化
郑永星 7a9a12f99c Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点无法重算限制
zhengyongxing e94994993a 特殊补点无法重算限制
郑永星 c4ea44c3f8 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点权限
廖金灵 ef5c95f49a Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
廖金灵 548c76bd99 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
优化
ELF 1b949af7f5 优化
廖金灵 cf821ae447 Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点权限
zhengyongxing ba80668560 特殊补点权限
廖金灵 482285dd56 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
修改bug
廖金灵 413ea02d34 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改bug
elf@home 1dd594f46f 修改bug
廖金灵 36cfcde5e1 Merge branch 'release' of wmtx/platform into master
版本更新
elf@home c663fa9be6 解决冲突
陈志 082d5c1eee Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化下游推广公司导出
chenzhi 9c11344906 优化下游推广公司导出
郑永星 3310553654 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例格式修正
zhengyongxing 1c08d1a221 比例格式修正
郑永星 10e50b4bec Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例与日期格式修正
zhengyongxing f18f3ce7e2 比例与日期格式修正
陈志 0c696fd8a5 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
陈志 4813e28fec Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化汇总说明
郑永星 ff1117c0b7 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
小bug修改
zhengyongxing 5acd5197ae 小bug修改
chenzhi b899ff7af7 优化汇总说明
ELF bdc23b7d90 修改
廖金灵 a6bc59dd53 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
测试
ELF 1e5c0cca66 测试
廖金灵 de9367618b Merge branch 'feature/agg_game_fail' of wmtx/platform into release
优化
廖金灵 4994e9182d Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
ELF 1fb2fa7e81 解决冲突
ELF 8d98bd5a36 优化
ELF d123f7b779 优化
廖金灵 6a78824b10 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
郑永星 e554d9c288 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点加入下游结算中
zhengyongxing 19c7f7db0d 特殊补点加入下游结算中
郑永星 1aebf2b939 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点分成金额功能修正
zhengyongxing eac0fc61c0 特殊补点分成金额功能修正
ELF 268e084241 修改
陈志 d41856f581 Merge branch 'hotfix/change_develop_type' of wmtx/platform into master
优化公司关系跟随
chenzhi aef60b02d8 优化公司关系跟随
陈志 e1db5c9a47 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化重算按钮的出现
chenzhi ae9d7f7574 优化重算按钮的出现