174 Commits (68ba764d72a72e7fdf6251003df889daf3682b2c)

Author SHA1 Message Date
ELF 2b1980bfbd 修改 4 years ago
zhengyongxing ab9be65422 内部公司功能提交 4 years ago
chenzhi b899ff7af7 优化汇总说明 4 years ago
chenzhi ae9d7f7574 优化重算按钮的出现 4 years ago
ELF 6e2fda1e26 解决冲突 4 years ago
廖金灵 d48e90e1db Merge branch 'feature/new_game_auth' of wmtx/platform into release
新增游戏自动授权
4 years ago
ELF 32bc839dcd 合并 4 years ago
ELF e0bbec0978 修改 4 years ago
elf@home c40fbf3870 新增游戏自动授权 4 years ago
chenzhi ff19f3259f 优化下游公司多比例结算 4 years ago
chenzhi 4f70b89063 优化系统任务执行 4 years ago
chenzhi b88f2986bd 优化重算,兼容wind 4 years ago
chenzhi 8b82fff791 优化任务插入 4 years ago
chenzhi 62b566e8b8 优化地址填写 4 years ago
chenzhi f0e43df7c2 新增重算 4 years ago
chenzhi fb75494c64 新增系统执行命令方法 4 years ago
chenzhi 9f06436207 优化转换注释 4 years ago
chenzhi 04ac1da1d7 优化公司控制会长游戏规则 4 years ago
chenzhi ef4702fb46 暂存 4 years ago
ELF 0803b686c3 解决冲突 4 years ago
ELF 0206a422f9 解决冲突 4 years ago
ELF 557f0203ac 解决冲突 4 years ago
ELF 62d7f15fdc Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign 4 years ago
zhengyongxing 1fff2e6c09 财务代码搬到新的分支上 4 years ago
chenzhi 2619e598e8 合并marster 4 years ago
yulingwei 2fbea72d26 up 4 years ago
chenzhi afac0376be 新增下游审批 4 years ago
chenzhi cafdc39f2a 优化添加 4 years ago
chenzhi d662c89b7e zancun 4 years ago
ELF e8a925b64c 游戏统计添加聚合充值数据 4 years ago
chenzhi 5aa7427504 新增公司信息编辑 4 years ago
chenzhi 33cf2cf8a6 新增审核列表 4 years ago
chenzhi f66ec6d1ff 优化函数 4 years ago
chenzhi 296b5a0d8f 优化关系函数 4 years ago
ELF 15d0b454a4 修改 4 years ago
chenzhi d6ec8e0248 新增导出 4 years ago
ELF f167d63c4a 修改 4 years ago
zhengyongxing 15b9efcd7e 江息网络漏掉的修改 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 a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
4 years ago
廖金灵 c4ec5753f0 Merge branch 'feature/loginInfo' of wmtx/platform into release
手机验证码登录推广后台
4 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
chenzhi 6a3b9b6da3 新增游戏分成比例 5 years ago
sunke 2a017bfb45 loginmodel 5 years ago
zhengyongxing 132b601f74 测试资源搜索功能添加 5 years ago
zhengyongxing 6081e088db 游戏统计bug修改 5 years ago
zhengyongxing 057a51dbeb 游戏统计bug修正 5 years ago
zhengyongxing 81bd79ecf8 游戏统计bug修正 5 years ago
zhengyongxing 4b63c7b786 游戏统计bug修正 5 years ago
zhengyongxing b768d41935 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
 Conflicts:
	Application/Home/Controller/PackageController.class.php
5 years ago