3776 Commits (ed25d54dc875a517f0df9130e9edfbf51b52a1fe)
 

Author SHA1 Message Date
liuweiwen 51844a824e 工会归属会长必填 5 years ago
liuweiwen e2095af7a8 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
liuweiwen 49e0e19cc8 推广员与合作公司只能看到自己的公司的对账记录 5 years ago
zhengchanglong 6e405febc1 设置分成比例安卓IOS同步更新 5 years ago
zhengyongxing 8b4c641f02 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengyongxing 3c9a828537 市场结算官方渠道检索修正 5 years ago
chenzhi 5996b5f45e Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi cc653c2d2d 优化tp1.id错误 5 years ago
zhengyongxing a968c5dbe4 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengyongxing a4b53c4e9a 结算单管理字段名修正 5 years ago
liuweiwen 33397aceb3 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
liuweiwen 0694b457bd 更新sql 5 years ago
zhengyongxing 0c403ddf57 结算单管理字段名修正 5 years ago
zhengyongxing 4d6a45657c Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengyongxing 73578f1b64 生成下游订单修改 5 years ago
chenzhi e024493b4b Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi 864e8d693a 优化前端浮点数计算 5 years ago
liuweiwen e9c7580de8 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
liuweiwen 4e6555d7fa 更新sql 5 years ago
zhengyongxing 6baba8db28 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengyongxing 135cba359e 菜单高亮修改 5 years ago
liuweiwen 7f0dbe1112 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
liuweiwen 1e4b7f69d5 cp/工会对账系统 5 years ago
zhengyongxing c27518b988 市场结算添加编辑添加户名 5 years ago
zhengyongxing 26c7190654 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengyongxing ef53562d06 市场结算添加编辑添加户名 5 years ago
chenzhi 8ff8d1dab8 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi ac0405329f 优化编辑 5 years ago
liuweiwen 21ee77609c cp/工会对账系统 5 years ago
chenxiaojun bfc93e0626 公会分成管理--更新 5 years ago
chenxiaojun 1594500eca 资质认证--更新 5 years ago
zhengyongxing 547b0439e3 市场结算添加编辑添加户名 5 years ago
chenzhi 1275c740d5 新增cp对账单删除 5 years ago
zhengyongxing da420ceb5c 市场结算添加编辑添加户名 5 years ago
zhengyongxing b74ac306ae 市场结算添加编辑添加户名 5 years ago
chenzhi 1bb038db4e 优化查看2 5 years ago
chenzhi 89d21c6218 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi f06cddc093 优化查看 5 years ago
zhengyongxing 2b335ec910 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing 45ea27fd1f 市场结算列表删除操作 5 years ago
chenzhi cba3fc898c 新增查看 5 years ago
liuweiwen fc5db0b298 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
# Conflicts:
#	Application/Admin/Controller/AjaxController.class.php
#	Data/update.sql
5 years ago
liuweiwen 394a3e4bb5 cp/工会对账系统 5 years ago
zhengyongxing 6bda9fe842 市场结算管理代码编辑完善 5 years ago
zhengyongxing ad901c31db 市场结算管理代码编辑完善 5 years ago
chenxiaojun 7550bafdf7 充值玩家--更新 5 years ago
zhengyongxing 99f23254ed 市场结算管理代码提交 5 years ago
zhengyongxing 68312cc277 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing 71b1498c71 市场结算管理代码提交 5 years ago
chenzhi 25240227e4 新增编辑 5 years ago