Commit Graph

6640 Commits (723b3c9fa2722a351ef7915b60ecd4ee856709a8)
 

Author SHA1 Message Date
ELF 9d041f7c8a 修改
ELF e441f030c0 优化
ELF e9038d7471 ss
chenzhi 69cf42e895 新增线下确认打款
ELF 9b88e97672 修改
ELF 296e378501 修改
ELF e4854aca3a 修改
chenzhi e2d179acd8 新增线下打款
zhengyongxing 9000533644 下游公司功能提交
ELF 1a14ed8dc7 修改
zhengyongxing 24e33ed8ba Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
chenzhi b35d0a0e95 新增删除日志
chenzhi 79468aa6f2 新增结算删除
ELF 34a22d65bf 修改
ELF 42547128d4 优化押金
chenzhi 36d72848bb 优化市场专员
chenzhi a18df8c6fb 优化下游个人多比例结算
ELF 7adabb54f9 修改
陈志 a15302bd8c Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化结算查看
chenzhi ed66facc8f 优化结算查看
陈志 ce32492445 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化下游公司多比例结算
chenzhi 8550109367 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
elf@home c40fbf3870 新增游戏自动授权
elf@home 50755b89c5 修改
zyx 89801c1467 特殊补点功能完善
zhengyongxing e6bc6853aa 特殊补点结算功能添加
ELF cc6c5d4e74 修改
chenzhi ff19f3259f 优化下游公司多比例结算
chenzhi 492d7a8f73 优化获取比例
chenzhi f5fb65e400 新增获取公司游戏比例
chenzhi 8e2f07db38 优化系统任务注释
chenzhi 4f70b89063 优化系统任务执行
chenzhi b88f2986bd 优化重算,兼容wind
chenzhi 7ceafb1d42 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
chenzhi 6e49bcc353 优化财务汇总
chenzhi 8b82fff791 优化任务插入
chenzhi 62b566e8b8 优化地址填写
ELF 2867a05bb3 修改
陈志 15676c69b9 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
chenzhi f0e43df7c2 新增重算
chenzhi fb75494c64 新增系统执行命令方法
ELF 0923006a20 修改
廖金灵 f0aa844244 Merge branch 'hotfix/spend_stat_recharge' of wmtx/platform into master
优化
ELF 3890410bec 优化
廖金灵 90bb38cd56 Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
修改BUG
ELF b1f4ec2d9a 修改
廖金灵 747dc7394c Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
修改bug
ELF 404da03cd0 修改
廖金灵 35d34d1864 Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
bug修复
ELF c7390f4c2e bug修复