3622 Commits (a643e88ffb0291e0b588952045787f46db78d021)
 

Author SHA1 Message Date
zhengyongxing 14ce9c02fa Merge branch 'release' of 47.111.118.107:wmtx/platform into release
 Conflicts:
	Application/Admin/Controller/MemberController.class.php
5 years ago
zhengyongxing 0349d5c5aa 用户信息小号隐藏 5 years ago
liuweiwen 822ec35ff8 Merge branch 'feature/group_type' into release 5 years ago
liuweiwen 2b3099a2d8 工会归属会长不可编辑 5 years ago
ELF c6d99af7a1 Merge branch 'hotfix/shift_player_selle' into release 5 years ago
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release 5 years ago
ELF f27728b9dd Merge branch 'hotfix/change_btn_color' into release 5 years ago
ELF f7a53c7562 Merge branch 'feature/account_safe' into release 5 years ago
廖金灵 9933682cc3 Merge branch 'release-1.0.1' of wmtx/platform into release
功能上预发布
5 years ago
ELF 1ba77738f3 解决冲突 5 years ago
ELF b0bc4c0496 解决冲突 5 years ago
ELF 0f44d9e95c 解决冲突 5 years ago
zhengchanglong bb08c723a3 Merge branch 'feature/group_type' into release-1.0.1 5 years ago
ELF 152ccbc210 修改落地页按钮颜色 5 years ago
liuweiwen 08f8c518a6 从dev复制代码 5 years ago
liuweiwen 7431072bbf 从dev复制代码 5 years ago
chenzhi 33be79e5cf Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi f34b71114f 优化数字提示 5 years ago
zhengyongxing 13d1da8733 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengyongxing 63b44a78ff 下游订单生成bug修正 5 years ago
chenzhi e5d8710f0a 优化罚款保存后数据不对 5 years ago
liuweiwen a26b0ab53f Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
liuweiwen 6f7dcb9ca5 修改上下游对账单导出文件名 5 years ago
chenxiaojun 6012fdbdf1 公会分成管理--更新 5 years ago
chenxiaojun 365a276b95 公会分成管理--更新 5 years ago
zhengyongxing 122a27634b Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing e73d795ace 生成下游结算单下拉选项框优化 5 years ago
chenzhi ce92602ca0 优化生成上游订单重复提醒 5 years ago
liuweiwen 6caf99e984 对账系统登录界面修改 5 years ago
zhengyongxing c09c3a591e 结算单bug修正 5 years ago
chenzhi cdb0b10c9a 结算列表新增对账单地址 5 years ago
chenzhi d889bef13d 优化上游时间选择提示 5 years ago
chenzhi c3848e5b55 优化上游信息提示 5 years ago
zhengyongxing a2ce005497 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing 71f2d75b8e 市场结算管理总流水点击查看各个渠道的流水 5 years ago
sunke 5f6611fc30 资质认证 5 years ago
chenxiaojun d615a1402f 公会分成管理--更新 5 years ago
liuweiwen b8e36847a3 cp对账系统退出 5 years ago
liuweiwen 57a1d8ed8c 对账系统 5 years ago
zhengyongxing f36202486d 生成上游订单修改 5 years ago
zhengyongxing 2f1d5fbd38 生成上游订单修改 5 years ago
chenzhi 0f8da4afac 优化页面显示 5 years ago
chenzhi 9c1cb95290 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi 41421a9b10 优化页面显示 5 years ago
liuweiwen ed706c1b86 公司信息管理加提示 5 years ago
zhengchanglong e4b07360ad 更新SQL语句 5 years ago
zhengyongxing 7f99dafb2c 市场结算管理 上游结算流水bug修正 5 years ago
liuweiwen a7e9f62367 对账系统自动登录 5 years ago
liuweiwen 51844a824e 工会归属会长必填 5 years ago
liuweiwen e2095af7a8 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago