Commit Graph

4291 Commits (ad48df6c91f234f2b9e96d65d540497367eda0f6)
 

Author SHA1 Message Date
yulingwei 3f5246f66c Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei c59aeaa9d3 upt
chenzhi 1bfcade0a8 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
chenzhi 62a867c592 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
chenzhi 5b45c4273c 优化公会统计选择游戏
yulingwei 5468239cf3 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei e8e0af97bf 修复结算时间
chenzhi 43a6a746b0 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
zhengyongxing 061d7373fb 市场结算管理内外团新增内团分发
chenzhi f0d298c042 公会统计新增团体类型
chenxiaojun 19deadfcfa 推广平台>财务管理>提现记录--更新
chenxiaojun a863f7ff99 推广平台>财务管理>提现记录--更新
chenxiaojun d8cbfae51a 推广平台>数据管理>推广员指标--更新 推广平台>财务管理>结算中心--更新
chenxiaojun 46d712cce7 推广平台>数据管理>推广员指标--更新
推广平台>财务管理>结算中心--更新
yulingwei 82bc3a8dbd upt
yulingwei b99138fa85 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei 14b5ea78cd upt
zhengyongxing ccc1b177a0 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 96fd5cbdd5 测试服订单管理bug修正
liuweiwen 077a770de7 奖罚记录管理-》奖罚时间为空判读,新增编辑判读
liuweiwen e8f07f4292 日期格式修改
liuweiwen 5b63a2fe84 Merge remote-tracking branch 'origin/release' into release
liuweiwen f9fe74986c Merge branch 'feature/admin_optimize' into release
liuweiwen b2e039b460 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen f6af63ca3e 合同期限为空时间格式,公司信息导航高亮
zhengyongxing 5158b07d85 测试订单管理高亮添加
zhengyongxing 932958a071 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengyongxing be932b1ebd 奖罚管理bug修改
zhanglingsheng a26a02b36f Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengchanglong c6a0f87dfe 奖罚编辑部分字段只读
zhanglingsheng 9afd27cdc6 Merge branch 'hosfix/tool_pay' into release
liuweiwen 5949542b70 Merge branch 'feature/admin_optimize' into release
liuweiwen 6d91ec7c60 推广员-》奖罚记录管理-》上下游公司与公司类型联动,解决未显示下游公司问题
ELF fe130a06d9 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
ELF cd1ad1a5a4 Merge branch 'feature/promote_deposit' into release
ELF e58bb1149f 修改落地页授权
zhengchanglong e55bfcb2d8 奖罚编辑部分字段只读
chenzhi 2361c6502a Merge branches 'release' and 'feature/finance_cwflhz' of 47.111.118.107:wmtx/platform into release
chenzhi b3560b4345 优化财务汇总统计
zhengchanglong 586dbf49e9 添加奖罚记录返回出现错误提示BUG修复
chenzhi 3ddef5d790 Merge branch 'feature/finance_cwflhz' of 47.111.118.107:wmtx/platform into release
chenzhi e4854d4ac7 优化财务汇总名词写错问题
liuweiwen e243675bcc 将子窗口的方法转到ajax控制器
liuweiwen 854ab9f509 合作方导出不打开新窗口
liuweiwen d50627e4fb Merge remote-tracking branch 'origin/release' into release
liuweiwen 70c71abac1 隐藏我方分成比例
chenzhi 07053d822e Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into release
chenzhi bb276f2bcc 优化推广公司列表
liuweiwen a114c7e659 Merge branch 'feature/admin_optimize' into release
liuweiwen efe9d25988 Merge remote-tracking branch 'origin/release' into release