Commit Graph

3426 Commits (6bda9fe842caf02dacdd45012bb809b87272b6c0)
 

Author SHA1 Message Date
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 工会统计新增内外团占比
liuweiwen 1c8f0d4464 更新sql
liuweiwen c3a9282147 新增工会关系、工会归属字段
万盟天下 8e9749bacb Merge branch 'hotfix/login_crontab' of wmtx/platform into release
修复登录统计问题
ELF 96efc54888 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/login_crontab
yulingwei 25606949f5 修复登录统计问题
万盟天下 9105b75ddf Merge branch 'release-1.0.0' of wmtx/platform into release
合并release分支
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 公会统计新增公司联动
万盟天下 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 补单记录
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