Commit Graph

655 Commits (b5d71ae215154db31f33b6d61f2787eba7d632a2)

Author SHA1 Message Date
yulingwei b5d71ae215 Merge branch 'feature/pop_rules' into dev
yulingwei 7ea2a465bf 修复问题
chenxiaojun 009842c218 更新
chenxiaojun 4286817dea 推广提现--更新
zhengchanglong 9952029e6c Merge branch 'feature/group_type' into dev
zhengyongxing dddd640f9f 结算单管理列表修改
chenzhi d484c96744 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi cccbc3bfa8 新增cp结算单判断是否已经有交叉时间
zhengchanglong 10f2caefca Merge branch 'feature/group_type' into dev
zhengchanglong b34eec98ee 游戏分成比例设定体验优化
chenxiaojun 2d0143a378 更新
chenxiaojun dcea6b7e05 推广提现--更新
zhengchanglong 89d9b79930 Merge branch 'feature/group_type' into dev
zhengchanglong 5ac23b6a5b Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengchanglong de8386c0cb 游戏用户锁定备注显示
chenzhi 0934cd472a 新增cp结算单到列表中
zhengyongxing 2154899a6a Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing f87026a32c 结算单管理生成下游订单
chenzhi cda9d0c1a8 合并
chenzhi cd427a9409 新增添加cp上游对账单
zhengchanglong 437800b30b Merge branch 'feature/group_type' into dev
zhengchanglong 87096e180e 游戏用户锁定备注显示
zhengchanglong 7e1b90fc19 Merge branch 'feature/group_type' into dev
zhengchanglong 93fe724c15 游戏用户锁定备注显示
zhengchanglong ba4d2a4a2e Merge branch 'feature/group_type' into dev
zhengchanglong 941978bb07 【游戏】-【合作方管理】,联系人改为必填项,必填项前面加红色※号
zhengchanglong 8144e3c50f Merge branch 'feature/group_type' into dev
zhengchanglong e914fde68d 玩家列表账号锁定添加备注
chenxiaojun 3a9a7177fe 推广结算--更新
chenxiaojun ad80923bed 更新
chenxiaojun 114cb2f7a5 更新
chenxiaojun f244b42ab7 推广结算--更新
yulingwei 5cb129e95f 修复冲突
yulingwei e3f0a24e43 弹窗推广后台更新
zhengchanglong 505e12beab Merge branch 'feature/group_type' into dev
zhengchanglong 326d9e5a12 管理后台-游戏-游戏编辑:参数配置-新增CP游戏分成比例
liuweiwen 602fb33fcc 新增需求:管理后台-》系统-》扩展工具-》公司信息管理
yulingwei 249044b0de Merge branch 'feature/pop_rules' into dev
yulingwei 5542994e36 upt
zhengyongxing 7adb991d0e 市场结算管理上传
chenzhi 377bdaee72 合并gt
zhengyongxing 5e14eaf4c9 新增市场结算管理完善
liuweiwen 50320be1d2 新增需求:管理后台-》推广公会归属管理,列表,新增,编辑,审批
chenxiaojun f2e0cec5aa 更新
chenxiaojun 0927417ce9 推广结算--更新
chenzhi dfdad21d8e Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 0039431ccb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 1295857697 优化工会统计各级检索条件结束
chenzhi 0561d8ff15 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f95d23b091 优化公会统计各级条件展示