Commit Graph

320 Commits (e34c5533589bc60ae254ad224f464a8a8aba0434)

Author SHA1 Message Date
zhengyongxing f40bd57698 支付渠道意愿统计bug上传
zhengyongxing f7c9730153 市场结算管理优化
zhengyongxing 4ce89ee670 支付白名单列表功能完善
廖金灵 a6f82e5820 Merge branch 'feature/work_order' of wmtx/platform into release
修改默认评价分数为5分
yulingwei 9eac722222 修改评分默认5分
zhengyongxing 2adbd95bfb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ip_forbit
 Conflicts:
	Data/update.sql
yulingwei 26f89f3c64 merge
zhengyongxing c3adec70ec ip限制白名单提交
ELF bda92e4e1a 用户重复标识-注册事件通知
chenzhi ccaa9d3a78 优化公会游戏统计sql
yulingwei b8fda2417a 工单管理
zhengyongxing 55ad393efb 支付渠道添加索引
zhengyongxing 141bdf561a 支付渠道添加索引
zhengyongxing 84d061c887 sql更新
chenzhi f40072e7d7 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 518d2aa3f6 优化操作日志表结构
zhengyongxing 04f2b0c8df Merge branch 'feature/operation_log' into release
# Conflicts:
#	Application/Admin/Common/extend.php
#	Data/update.sql
sunke 1f6de9be57 操作日志
zhanglingsheng d8cd3ae79f 身份证数据添加info字段
liuweiwen 5d05edbca6 资源自动审核扣除已审核额度,申请后续增加自动审核功能
zhengyongxing 3c628fa1c6 统计日志添加
liuweiwen 9d7cfd768e 修改sql
liuweiwen cc8e2149e0 最低额度,最高额度,比例数据格式校验
chenzhi 50e4185d9c 操作日志-登陆记录
liuweiwen aa8d296dd8 推广后台-》测试资源申请-》符合规则的自动审核
liuweiwen 02920aab8a 资源审核配置列表、新增、编辑、删除、锁定、解锁
chenzhi 6dfb13e4d9 新增操作权限
zhanglingsheng 2c7eb8f191 支付类型添加易宝支付
zhanglingsheng 31466db00d 支付类型添加易宝支付
zhengchanglong 6b68ae8197 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
ELF dad83c8d38 押金付款方式添加选项
zhengyongxing 4f65efad9b 结算单管理添加审核状态
liuweiwen f6af63ca3e 合同期限为空时间格式,公司信息导航高亮
chenzhi 43a3beae23 合并财务分类汇总
sunke b191bdec8e sql
yulingwei e26f517df1 冲突解决
yulingwei 747bba16b0 汇总结算单管理
zhengchanglong 7672e06b4b Merge branch 'hotfix/test_order' into release
# Conflicts:
#	Data/update.sql
zhengchanglong e1ab1eade6 更新SQL信息
zhengchanglong 858c028faf Merge branch 'feature/add_promote_company' into release
# Conflicts:
#	Data/update.sql
zhengyongxing e6d136410d Merge branch 'feature/admin_optimize' into release
liuweiwen e15460b08f 合作方
yulingwei dfe52865bd upt
zhengyongxing 0b7327bc4e Merge branch 'feature/admin_optimize' into release
liuweiwen 7da5e25e16 合作方
yulingwei 469a037b0f merge
yulingwei 3c44d5d200 upt
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
chenzhi da2e3a769c 推广列表查看
liuweiwen ada2913cdc 奖罚记录管理根据公司类型搜索