101 Commits (4fe33c546f6b127dc04ef3bb60b6fa8a28b32088)

Author SHA1 Message Date
chenzhi 903c3abba0 市场部隐藏商户查看权限 3 years ago
ELF c39fecad01 修改 3 years ago
ELF 79872573b9 优化 3 years ago
ELF 525c3012b2 yhg 3 years ago
ELF d8357c072e 优化 4 years ago
ELF b231f1a50f 优化 4 years ago
ELF 82a70f0e05 优化 4 years ago
ELF 1912e2b203 搜索 4 years ago
chenzhi 822894ea17 优化公会查看 4 years ago
zhengyongxing 65e0fda02f 工会统计bug修正 4 years ago
chenzhi 3b447b70d0 优化公会统计 4 years ago
zhengyongxing 735823d792 工会统计bug修改 4 years ago
chenzhi c5bc599289 优化游戏统计 4 years ago
chenzhi 7ccf5e5857 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
chenzhi 9ab8454970 优化结算汇总 4 years ago
chenzhi 19c62de87c 優化公會統計 4 years ago
zhengyongxing c30e396b2c 未结算数据的补充 4 years ago
chenzhi 9ddfb6f794 现在参与结算筛选 4 years ago
zhengyongxing 6021f91604 公会订单添加所属商户 4 years ago
zhengyongxing 3f04fa1507 公会统计商户名称修改 4 years ago
zhengyongxing deee3228dd 公会统计商户导出 4 years ago
zhengyongxing 58ff5ad1ed 公会统计--订单详情 新增所属商户展示 4 years ago
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
5 years ago
ELF 1bec15c186 修改迁移bug 5 years ago
zhengyongxing 2fefd44d0c 公会统计推广员支付时间修正 5 years ago
zhengyongxing cd8f64c7e6 游戏详情订单修改 5 years ago
zhengyongxing 114e51ebe2 Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 5 years ago
zhengyongxing 2220a6cfec 财务支付时间修改,增加手机登录验证,及开发推广员列表名称 5 years ago
ELF f167d63c4a 修改 5 years ago
elf@home fb87be0b43 修改 5 years ago
zhengyongxing 2975b9fe35 市场业绩提成优化 5 years ago
廖金灵 4a755d2269 Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
5 years ago
ELF ecc228409d 修改 5 years ago
chenzhi bc75da8c14 解决冲突 5 years ago
zhengyongxing 15b9efcd7e 江息网络漏掉的修改 5 years ago
ELF 990a2bd206 解决冲突 5 years ago
ELF e94b6418f1 修改 5 years ago
ELF 8224cfb362 修改 5 years ago
ELF 77c692c44d 修改 5 years ago
zhengyongxing f63b115641 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
5 years ago
zhengyongxing 2fae4219df 公会统计去除 5 years ago
ELF e3b53e7df1 修改 5 years ago
ELF f9b054e1cb 修改 5 years ago
ELF 6f2f588617 优化 5 years ago
ELF 76fcfec7c2 修改 5 years ago
ELF 5f5a6ee1af 修改 5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
sunke a4377c017e 支付设置 5 years ago
zhengyongxing 0482836a8e 导出账号权限添加 5 years ago
zhengyongxing 001e9e70f8 管理后台导出权限添加 5 years ago