Commit Graph

3379 Commits (5ea753b595d7c3ab7daf2ad3aebade65b87b4719)
 

Author SHA1 Message Date
zhanglingsheng 5ea753b595 支付宝设置添加公钥私钥
zhengyongxing d842a5c468 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing e9ffc0af79 平台币充值添加推广员充值搜索修改,玩家列表时间检索非必填
chenxiaojun 6054b5f6c0 更新
chenxiaojun 0baf97f717 会长提现--更新
zhengyongxing 0068a0d1c4 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing f324567258 平台币充值添加推广员充值搜索修改,玩家列表时间检索非必填
zhengyongxing 346bbaa117 平台币充值添加推广员充值搜索修改,玩家列表时间检索非必填
chenxiaojun 5930642f8b 更新
chenxiaojun a12c3ecf9e 会长提现--更新
yulingwei c5f737cb0b Merge branch 'hotfix/login_crontab' into dev
yulingwei 25606949f5 修复登录统计问题
chenxiaojun e884214546 会长提现|公会分成管理--更新
ELF 69e4c3fbd7 Merge branch 'release' into dev
万盟天下 9105b75ddf Merge branch 'release-1.0.0' of wmtx/platform into release
合并release分支
ELF f1dc5f8920 推广员继承company_id
zhengyongxing 8652c19f5c 平台币充值添加推广员充值搜索
ELF 2efbeaf13f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenxiaojun c329ec09f4 更新
chenxiaojun 731e4d29f7 会长提现--更新
chenxiaojun 0758062837 会长提现--更新
chenxiaojun 73537c120e 更新
chenxiaojun 35ea788ed0 公会分成管理--更新
chenxiaojun 936240d06a 推广结算--更新
chenxiaojun 15174f8547 推广结算--更新
chenxiaojun 311aeffbb7 推广结算--更新
chenxiaojun 053417f7f8 推广结算--更新
chenxiaojun cda8e4c1c0 推广结算--更新
zhengchanglong 0e5be6e4a3 Merge branch 'release-1.0.0' into dev
chenxiaojun 5a0769eb3b 更新
chenxiaojun e447159971 公会分成管理--更新
万盟天下 23defe8174 Merge branch 'master_hotfix_20191228' of wmtx/platform into master
修改工会统计bug
chenzhi 4d0606d6fc 新增渠道查看公司联动
chenzhi f594e3bb14 公会统计新增公司联动
万盟天下 cd7a23a790 Merge branch 'hotfix/promote-status' of wmtx/platform into master
修改推广员添加时初始默认状态
ELF 88c8bef83e Merge branch 'hotfix/promote-status' into release-1.0.0
ELF 87fb1f526e 修改推广员添加时初始默认状态
ELF ee4dad6031 Merge branch 'master' of 47.111.118.107:wmtx/platform
liuweiwen 6625eaa4f7 工会统计
liuweiwen 809e9d36f1 工会统计
liuweiwen 28a1efe2f4 工会统计列表数据与搜索修复
liuweiwen b3e32506cc 工会统计搜索公司
liuweiwen c44e5ee1a7 编辑推广员时,只允许会长修改推广公司,同时更改底下推广员的公司
万盟天下 b2dd59918e Merge branch 'release-1.0.0' of wmtx/platform into master
超级签统计--导出
zhanglingsheng 7a9fe4fb45 超级签统计--导出
zhanglingsheng 34020fd725 超级签统计--样式
万盟天下 83fdc91060 Merge branch 'release-1.0.0' of wmtx/platform into master
版本更新
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 补单记录