322 Commits (93a6e9407527ca9b65156ed8191bd9c5de550798)

Author SHA1 Message Date
chenzhi da2e3a769c 推广列表查看 5 years ago
liuweiwen ada2913cdc 奖罚记录管理根据公司类型搜索 5 years ago
chenzhi 6a612565c6 扩展推广公司添加 5 years ago
zhengyongxing 0cbd58862e Merge branch 'release' of 47.111.118.107:wmtx/platform into release
 Conflicts:
	Data/update.sql
5 years ago
zhengyongxing 955a1917b3 生成个人结算单的功能完成 5 years ago
chenzhi e497fb16ee 移除新增推广公司结构 5 years ago
chenzhi 52971b378f 新增推广公司表结构 5 years ago
zhengchanglong 9b43cc90b4 Merge branch 'hotfix/test_order' into release
# Conflicts:
#	Data/update.sql
5 years ago
zhengchanglong bdbbeab1a0 添加测试订单录入表 5 years ago
yulingwei e35f20ee70 游戏预警 5 years ago
ELF c95f771ba0 解决冲突 5 years ago
ELF 423b4ae77b 解决冲突 5 years ago
sunke f65ad73acf sql公司录入 5 years ago
sunke cec446b5ab sql 5 years ago
ELF bbb31890f6 未收押金会长禁用落地页/下载页 5 years ago
ELF ed25d54dc8 解决冲突 5 years ago
ELF 501b8099d4 解决冲突 5 years ago
chenxiaojun 2c52bccaf7 管理后台>推广员>结算管理>推广提现>自动审核管理--更新 5 years ago
yulingwei a10a21c12b update sql remark 5 years ago
liaojinling e596d11cee 会长押金 5 years ago
jbRotk a6b1194be0 解决冲突 5 years ago
jbRotk 5d315d4182 添加工会类型 5 years ago
zhengchanglong 8b33a52cd0 修改奖罚记录字段顺序 5 years ago
jbRotk 2e4f1edb5a 修改sql 5 years ago
liuweiwen eb30abd06a 更新sql语句 5 years ago
liuweiwen b444a3546b Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
# Conflicts:
#	Data/update.sql
5 years ago
liuweiwen c92fa425d2 内部公司信息管理 5 years ago
jbRotk c968e54cf8 解决冲突 5 years ago
jbRotk 94afe49b0c upt 5 years ago
liaojinling d789a175f8 推广员/组长添加备注 5 years ago
jbRotk 35b6d25ebc upt 5 years ago
chenzhi aba7ed22d1 财务汇总分类脚本-按收入类型 5 years ago
chenxiaojun f1b454627e 管理后台更新 5 years ago
chenxiaojun a8008fbe05 管理后台>推广员>结算管理>公会分成管理--规则修改 5 years ago
chenxiaojun 73f1055303 管理后台>推广员>结算管理>推广提现--增加自动审核功能 5 years ago
zhengchanglong 72d222a64a CP分成比例修改 5 years ago
chenxiaojun 10665cc869 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
sk 4ce64d43aa 公司录入sql语句 5 years ago
ELF e8a0975981 解决冲突 5 years ago
ELF 6993d164a3 解决冲突 5 years ago
sunke 6bdc31dfa1 会长权限sql 5 years ago
ELF d3a3b8cdb7 修改 5 years ago
yulingwei f0109e9554 合并请求 5 years ago
yulingwei 7b2a60147a upt 5 years ago
sunke d2b7e91a64 推广配置 5 years ago
ELF 0d45be780f 解决冲突 5 years ago
chenxiaojun 5a75ea406a 更新 5 years ago
chenxiaojun a643e88ffb 财务管理--更新 5 years ago
chenxiaojun b367b4a8d3 公会分成管理--更新 5 years ago
chenxiaojun 66a238dfd4 结算管理--更新 5 years ago
chenxiaojun 6e05546db6 公会分成管理--更新 5 years ago
yulingwei 23f2334e45 新增充值权限查看 5 years ago
ELF f0acbc1c24 充值信息根据会长权限显示 5 years ago
chenxiaojun 2e1742c759 推广提现--更新 5 years ago
sunke 9152a3ef59 推广配置导入功能 5 years ago
ELF 3ab162ae65 修改sql 5 years ago
ELF c4934613ae 解决冲突 5 years ago
ELF b0bc4c0496 解决冲突 5 years ago
ELF 0f44d9e95c 解决冲突 5 years ago
chenxiaojun 02ccf125dc 公会分成管理--更新 5 years ago
chenxiaojun 365a276b95 公会分成管理--更新 5 years ago
zhengchanglong e4b07360ad 更新SQL语句 5 years ago
zhengyongxing e637c90021 Merge branch 'feature/group_type' into dev 5 years ago
liuweiwen 0694b457bd 更新sql 5 years ago
chenzhi 96466100bb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 5 years ago
liuweiwen 4e6555d7fa 更新sql 5 years ago
zhengchanglong 1c00290da9 Merge branch 'feature/group_type' into dev
# Conflicts:
#	Data/update.sql
5 years ago
liuweiwen fc5db0b298 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
# Conflicts:
#	Application/Admin/Controller/AjaxController.class.php
#	Data/update.sql
5 years ago
liuweiwen 394a3e4bb5 cp/工会对账系统 5 years ago
yulingwei 84053802e5 新增sql 5 years ago
yulingwei 1a6f4f2178 sql 5 years ago
zhengchanglong 89d9b79930 Merge branch 'feature/group_type' into dev 5 years ago
chenzhi cda9d0c1a8 合并 5 years ago
chenzhi cd427a9409 新增添加cp上游对账单 5 years ago
zhengchanglong f8b0d74553 Merge branch 'feature/group_type' into dev
# Conflicts:
#	Data/update.sql
5 years ago
zhengchanglong e4d88b6405 添加更新SQL语句 5 years ago
chenxiaojun 114cb2f7a5 更新 5 years ago
chenxiaojun f244b42ab7 推广结算--更新 5 years ago
chenzhi 377bdaee72 合并gt 5 years ago
liuweiwen 50320be1d2 新增需求:管理后台-》推广公会归属管理,列表,新增,编辑,审批 5 years ago
chenzhi 5326ef28db 合并 5 years ago
chenzhi 94243a5ea6 修改update冲突 5 years ago
liuweiwen d1c60ed153 新增表sql 5 years ago
chenxiaojun f2e0cec5aa 更新 5 years ago
chenxiaojun 0927417ce9 推广结算--更新 5 years ago
chenzhi 0039431ccb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 5 years ago
liuweiwen fa3adf2e0b 新增合作方时,新增录入内容
新增联系人,联系电话,邮寄地址。公司税号,收款方名称,
银行账号,开户行
5 years ago
chenxiaojun c3bd0e5a2b 渠道结算 5 years ago
chenxiaojun 631c23568d 上传汇款证明--调整 5 years ago
chenxiaojun 90eed6f5ca 结算管理--更新 5 years ago
chenxiaojun 8b7d592340 结算管理--更新 5 years ago
chenxiaojun c074b5fb86 结算管理--更新 5 years ago
liuweiwen 1c8f0d4464 更新sql 5 years ago
chenxiaojun 0baf97f717 会长提现--更新 5 years ago
liuweiwen c3a9282147 新增工会关系、工会归属字段 5 years ago
chenxiaojun e884214546 会长提现|公会分成管理--更新 5 years ago
zhanglingsheng 7ba7de46a3 游戏--添加支付方式渠道配置 5 years ago
zhanglingsheng 669baefe5e 游戏--添加支付方式渠道配置 5 years ago
ELF 48b18db141 修改落地页 5 years ago
ELF 6e55b657a4 修改落地页 5 years ago