elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,459 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

3041 Commits (a968c5dbe44854b9c75006afda882171013a2689)

Author SHA1 Message Date
zhengchanglong 941978bb07 【游戏】-【合作方管理】，联系人改为必填项，必填项前面加红色※号
zhengchanglong e914fde68d 玩家列表账号锁定添加备注
zhengchanglong 326d9e5a12 管理后台-游戏-游戏编辑：参数配置-新增CP游戏分成比例
zhengyongxing ea140a430f 导出模板方法上传
liuweiwen 602fb33fcc 新增需求：管理后台-》系统-》扩展工具-》公司信息管理
zhengyongxing c6f798dc47 市场结算管理bug修正
zhengyongxing f124e4b7ff Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 7adb991d0e 市场结算管理上传
zhengyongxing ba158e6b9a 市场结算管理上传
chenzhi ff67974413 修复获取推广员统计bug
zhengyongxing 5e14eaf4c9 新增市场结算管理完善
liuweiwen 50320be1d2 新增需求：管理后台-》推广公会归属管理，列表，新增，编辑，审批
zhengyongxing 4fb2806656 新增市场结算管理
chenzhi c711601fdf Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 216321f46b 优化换绑逻辑判断是否订单在审核中
zhengyongxing 89883d2005 新增市场结算管理
chenzhi 414f326cf4 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing f1a48fbdaa 权限分配 — 未给下级渠道分配（游戏充值）查看权限时，页面展示（游戏充值页面）修正
chenzhi 1295857697 优化工会统计各级检索条件结束
chenzhi 0561d8ff15 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f95d23b091 优化公会统计各级条件展示
liuweiwen 4892db340e 管理后台-》游戏-》合作方管理-》列表增加字段联系人，联系电话，邮寄地址。公司税号，收款方名称，银行账号，开户行
chenzhi 9e2eb46904 公会统计游戏统计新增多重搜索
liuweiwen fa3adf2e0b 新增合作方时，新增录入内容 
新增联系人，联系电话，邮寄地址。公司税号，收款方名称，
银行账号，开户行
chenzhi c20d507df6 优化订单判断
chenzhi 878badef43 换绑新增判断渠道是否已经结算
chenzhi 876952f3b4 公会统计新增内外团检索
chenzhi a37d0d6ec4 优化推广员充值统计排序问题
chenzhi 43774e9099 推广员充值统计新增官方渠道统计
chenzhi 14fa967f00 优化推广员统计数据
zhengyongxing 302ee7a2ca Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 5343ef2162 工会统计新增内外团
chenzhi 0caa548525 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 836eccfa78 支付渠道新增支付渠道比
zhengyongxing acd816c766 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing cc0f5a03c4 工会统计新增内外团导出
chenzhi 07f6e9919d 区服列表 区服名称改区服id
chenzhi 0f7134c838 游戏充值 区服名称改区服id
chenzhi 3bf288fa41 优化登陆记录区服名称为区服id
chenzhi 5e08bda6c2 优化行为日志区服名称为区服id
chenzhi 432c84ba01 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi e39c811da8 修改月结月份显示错误问题
liuweiwen 4addf4c281 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 0b3ae062b1 优化：推广员新增与编辑的推广公司增加万盟天下科技 
新增需求：推广员增加工会归属和工会关系属性
zhengyongxing 10f6caddfa 工会统计新增内外团占比
ELF 96efc54888 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/login_crontab
yulingwei 25606949f5 修复登录统计问题
ELF f1dc5f8920 推广员继承company_id
ELF 2efbeaf13f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
万盟天下 23defe8174 Merge branch 'master_hotfix_20191228' of wmtx/platform into master 
修改工会统计bug
chenzhi 4d0606d6fc 新增渠道查看公司联动
chenzhi f594e3bb14 公会统计新增公司联动
ELF 88c8bef83e Merge branch 'hotfix/promote-status' into release-1.0.0
ELF 87fb1f526e 修改推广员添加时初始默认状态
liuweiwen 6625eaa4f7 工会统计
liuweiwen 809e9d36f1 工会统计
liuweiwen 28a1efe2f4 工会统计列表数据与搜索修复
liuweiwen b3e32506cc 工会统计搜索公司
liuweiwen c44e5ee1a7 编辑推广员时，只允许会长修改推广公司，同时更改底下推广员的公司
zhanglingsheng 7a9fe4fb45 超级签统计--导出
zhanglingsheng 34020fd725 超级签统计--样式
yulingwei 9d5bfc5ef2 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng e3ef73e7e3 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng e709816781 补单记录
yulingwei 75d3e87f89 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 899877e872 同步修改
ELF 834115c213 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 561787a4ac 修改
zhanglingsheng 8a9e0a9a8b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng ca401adbd0 补单记录
ELF a70c1aee21 Merge branch 'release-1.0.0' into dev
ELF 0a86f3a33c 修改样式
chenzhi 04c560312f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 715a1a8a2c 优化推广统计区服问题
ELF 6297ff7011 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 67caddeef0 修改落地页样式
yulingwei f4495f93a9 ltv修改
yulingwei 3ec7ccc188 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 873c81605e 修复
zhanglingsheng 908de1336f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng b88f395c9a 补单记录
zhanglingsheng 6a28abedc0 补单记录
ELF 8cdf259fdf Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF c054595a94 修改微信分享bug
chenxiaojun 905769f922 Merge remote-tracking branch 'origin/dev' into dev
chenxiaojun 9a0313b763 公会分成管理--更新
sunke 453c0c3682 链接归属名词修改
chenxiaojun e66893dc7f 公会分成管理--更新
yulingwei 8ccde7749a Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 3e11b4d0ad 更新
yulingwei 1e3079870e Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei ee18eac375 修复
yulingwei b868b14273 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 21cc6865d5 Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 2ed2117b6d 更新
ELF ad67717292 Merge branch 'release-1.0.0' into dev
yulingwei e2ed862130 Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 7d1808a7bf Merge branch 'hotfix/ltv' into dev
yulingwei 12f00ad268 修复
chenzhi a5c926b2cd 优化区服预告区服选择