1361 Commits (990a2bd2066613295171daf51351bc00719c492f)

Author SHA1 Message Date
ELF 990a2bd206 解决冲突 4 years ago
chenzhi 91ae987c3c 优化游戏比例分成无需大于 4 years ago
chenzhi 9dd4a507e9 隐藏模板批量操作 4 years ago
chenzhi f1824fd7b3 优化新增名称 4 years ago
chenzhi c76cf038cd 己方公司 4 years ago
zhengyongxing ca5c68d078 推广公司编辑添加合并错误去除 4 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
4 years ago
zhengyongxing 2fae4219df 公会统计去除 4 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
4 years ago
ELF e3b53e7df1 修改 4 years ago
ELF 34691d6baa 修改 4 years ago
ELF 76fcfec7c2 修改 4 years ago
ELF 5f5a6ee1af 修改 4 years ago
廖金灵 c1163e7b22 Merge branch 'release' of wmtx/platform into master
版本更新2020.06.24
4 years ago
zhengyongxing c3956f7ed2 平台币金额解释添加 4 years ago
廖金灵 1907985e7b Merge branch 'feature/ylw-06-10' of wmtx/platform into release
新增公司选择默认模板
4 years ago
yulingwei ff9b2249b8 新增公司默认选择默认模板 4 years ago
廖金灵 db32f11215 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
取消测试的虚拟验证码
4 years ago
chenzhi 95d9f45612 新增检索 4 years ago
yulingwei c8924779c4 Merge branch 'release' into feature/ylw-06-17 4 years ago
yulingwei 8c18f2aa1d 1 4 years ago
ELF 2d872ed710 解决冲突 4 years ago
ELF 2589806e62 解决冲突 4 years ago
yulingwei 3f4406a1ee Merge branch 'release' into feature/ylw-06-17 4 years ago
yulingwei 0decb03cb1 merge 4 years ago
ELF a153fb9a0e 修改 4 years ago
chenzhi ad801a37fb 优化前端 4 years ago
yulingwei b2b28bce07 upt 4 years ago
yulingwei 5b604ab073 upt 4 years ago
chenzhi ca551b9c50 己方公司新增搜索项目 4 years ago
chenzhi e0b588be11 新加加载load 4 years ago
chenzhi 26ccc9c450 优化导出权限 4 years ago
chenzhi 40940b4536 优化比例 4 years ago
zhengyongxing 25ae6a03a4 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance 4 years ago
zhengyongxing b664ba46ad 汇总单代码提交 4 years ago
chenzhi 53b9513935 新增结算 4 years ago
chenzhi 53004adf5d 新增打款 4 years ago
zhengyongxing 9d43914b17 汇总单结算代码上传 4 years ago
chenzhi fdccc92c43 新增只支持脚本访问 4 years ago
chenzhi 38ab488cd0 修复搜索错误 4 years ago
chenzhi 261e63b898 取消未结算的导出 4 years ago
chenzhi 0312c1bc75 修复常见bug 4 years ago
chenzhi b28231d12f 优化己方公司返回 4 years ago
chenzhi 31ef129b2d 修复己方公司不能删除 4 years ago
chenzhi ffee256f93 优化bug1 4 years ago
chenzhi fb0edbe752 新增支付备注 4 years ago
chenzhi d5aeb21b33 新增结算周期读取 4 years ago
chenzhi 553d9b0f91 新增分成生效模板 4 years ago
chenzhi 3611e4855d 合并冲突 4 years ago
zhengyongxing 825fba2d8b 用户数据权限bug修复,筛选bug修复 4 years ago