231 Commits (3a4fb5122230996506edbfe4766133d2b65e6273)

Author SHA1 Message Date
ELF 19c782b053 解决冲突 4 years ago
zhengyongxing 5c65f356b2 市场业绩开发类型修正 4 years ago
ELF ad34536256 修改 4 years ago
ELF 6fcaa1362c 重置权限缓存 4 years ago
zhengyongxing 0631c22c93 上游导出修正 4 years ago
chenzhi bcdbb3d0a0 优化导出保留两位小数 4 years ago
chenzhi f73a9033b3 新增下游个人比例 4 years ago
万盟天下 c60d7c6671 Merge branch 'hotfix/market_percentage' of wmtx/platform into master
上游导出修正
4 years ago
zhengyongxing 288078c959 上游导出修正 4 years ago
陈志 0c696fd8a5 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
4 years ago
zhengyongxing 5acd5197ae 小bug修改 4 years ago
ELF bdc23b7d90 修改 4 years ago
zhengyongxing a146dd820a 平台结算导出与列表选项修改 4 years ago
chenzhi d63edee6b3 优化结算单界面信息 4 years ago
chenzhi 180e21be86 优化结算上游结算为一单 4 years ago
chenzhi 5db1f7ce24 优化比例显示 4 years ago
chenzhi 4143a67238 优化下游个人导出 4 years ago
chenzhi 9ee69f9bd4 优化下游结算单导出 4 years ago
chenzhi 82787ca561 优化上游结算单导出模板样式 4 years ago
chenzhi 07fd53a6aa 优化上游导出文件格式及时间问题 4 years ago
chenzhi 7ba9c25610 优化上游导出% 4 years ago
廖金灵 6c8699dc1e Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币导出bug修正
4 years ago
zyx 8c0646d2a0 平台币导出bug修正 4 years ago
廖金灵 0665e8265a Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场结算管理bug修正
4 years ago
zyx 5dcc25f97e 市场结算管理bug修正 4 years ago
chenzhi 1ac4c280ad 优化其他导出 4 years ago
chenzhi 54239b1f54 优化导出 4 years ago
chenzhi 9d9eae85ec 优化上游比例获取 4 years ago
廖金灵 d73ab9c4cd Merge branch 'feature/payment_merchant' of wmtx/platform into release
完善支付商户操作日志
4 years ago
ELF a4d4a51a2c 完善支付商户操作日志 4 years ago
chenzhi 205c6a83f8 优化上游结算 4 years ago
zhengyongxing a960e0a7e4 商户bug修改 4 years ago
zhengyongxing ee5fc4c7c8 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/View/Spend/lists.html
4 years ago
zhengyongxing 9670bf86b6 商户bug修改 4 years ago
ELF 0803b686c3 解决冲突 4 years ago
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
4 years ago
ELF 557f0203ac 解决冲突 4 years ago
chenzhi 0237e0ff63 优化导出 4 years ago
chenzhi 1ec951d344 优化空值显示 4 years ago
chenzhi a3f28b67a5 新增游戏搜索 4 years ago
zhengyongxing 341fa19b6f 聚合公司功能提交 4 years ago
chenzhi 8ac604be33 优化导出 5 years ago
zhengyongxing 1ff82cce20 聚合下游公司列表添加 5 years ago
chenzhi 2619e598e8 合并marster 5 years ago
zhengyongxing cacb1e4cf4 商户统计结算功能添加 5 years ago
yulingwei 2fbea72d26 up 5 years ago
chenzhi f731a417bd 优化工会关系 5 years ago
chenzhi 35f2fe3f05 优化公司显示 5 years ago
chenzhi 0c2e2db65d 新增税费费率 5 years ago
zhengyongxing 53979941a0 列表全部开发给市场专员,其他人员的数据隐藏 5 years ago