1666 Commits (73dff8839e14dfe6968625364cd12bf77ec940d0)

Author SHA1 Message Date
zhengyongxing 73dff8839e Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
4 years ago
chenzhi ce5a83e9bc 优化汇总导出错误 4 years ago
zhengyongxing 6103908d83 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementController.class.php
	Application/Admin/Controller/CompanyStatementPoolController.class.php
4 years ago
zhengyongxing 872de1ff73 上下游聚合打款信息修改 4 years ago
zhengyongxing b75e0725a1 特殊补点功能修改 4 years ago
zhengyongxing 9265d7c9b6 上下游聚合打款信息修改 4 years ago
chenzhi 180332ab87 优化下游未汇总导出 4 years ago
chenzhi 4a98c587fa 新增线下打款确认 4 years ago
chenzhi 69cf42e895 新增线下确认打款 4 years ago
chenzhi e2d179acd8 新增线下打款 4 years ago
zhengyongxing 9000533644 下游公司功能提交 4 years ago
zhengyongxing 24e33ed8ba Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
4 years ago
chenzhi 79468aa6f2 新增结算删除 4 years ago
chenzhi 36d72848bb 优化市场专员 4 years ago
zyx 89801c1467 特殊补点功能完善 4 years ago
zhengyongxing e6bc6853aa 特殊补点结算功能添加 4 years ago
chenzhi 6e49bcc353 优化财务汇总 4 years ago
chenzhi f0e43df7c2 新增重算 4 years ago
chenzhi f5ad1a6d0c Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
chenzhi 03341a7d9f 优化游戏资质展示 4 years ago
chenzhi e94c452f85 取消结算单的管理员审核 4 years ago
zhengyongxing 250d2ac2c0 市场业绩毛利修改 4 years ago
chenzhi fc05c274c4 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
chenzhi 2b2acf833c 优化重复添加 4 years ago
chenzhi f91db42a57 优化下游导出2 4 years ago
chenzhi 901198f546 优化下游个人信息 4 years ago
chenzhi b74b5ecfad 优化下游结算与导出 4 years ago
廖金灵 db4fc9699c Merge branch 'feature/finance_statement_three' of wmtx/platform into master
优化结算
4 years ago
chenzhi 7eee79a867 优化导出 4 years ago
chenzhi d63edee6b3 优化结算单界面信息 4 years ago
chenzhi 51778a2a73 优化下游公司导出及汇总 4 years ago
chenzhi d7a9663d46 优化上游不结算 4 years ago
chenzhi 180e21be86 优化结算上游结算为一单 4 years ago
chenzhi ec7b333fa4 优化下游个人打款设置 4 years ago
chenzhi ea7bafec91 优化下游重算 4 years ago
chenzhi 7beaff1825 优化下游个人汇总查看 4 years ago
zhengyongxing bd9af09830 市场结算管理bug修正 4 years ago
chenzhi 4143a67238 优化下游个人导出 4 years ago
廖金灵 c53abd3114 Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master
优化添加关系的开票内容
4 years ago
chenzhi 372958f45d 优化添加关系的开票内容 4 years ago
廖金灵 0665e8265a Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场结算管理bug修正
4 years ago
zhengyongxing 22961561d4 充值订单充值状态增加 4 years ago
chenzhi 0fd5bc7fe8 优化汇总时间显示 4 years ago
chenzhi b9567f6faf 优化时间戳模式 4 years ago
chenzhi a90149b31b 隐藏会长结算方式 4 years ago
chenzhi 12f232219c 优化下游个人查看 4 years ago
chenzhi 71d0d2c9d1 优化个人显示支付方式 4 years ago
chenzhi 52345e4eb1 优化导出新增支付宝信息 4 years ago
廖金灵 8c942dbcbc Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币增加商户
4 years ago
zyx 3c8f637240 平台币导出增加商户 4 years ago