Commit Graph

3581 Commits (afa7aa8988fd24d017a9362a64cb99d943c22145)
 

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