666 Commits (828252cee9bee5a071ce604a53d0aeb3bf4b728a)

Author SHA1 Message Date
zhengyongxing 3559d91a32 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
zhengyongxing 7770fc13c8 市场结算管理总流水弹窗优化 5 years ago
liuweiwen d1022c85fd Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 5a633ccb49 工会归属申请时间日期格式化 5 years ago
zhengyongxing 8cbf3574e3 市场结算管理总流水弹窗优化 5 years ago
liuweiwen 822ec35ff8 Merge branch 'feature/group_type' into release 5 years ago
liuweiwen 2b3099a2d8 工会归属会长不可编辑 5 years ago
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release 5 years ago
ELF b0bc4c0496 解决冲突 5 years ago
ELF 0f44d9e95c 解决冲突 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
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
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
liuweiwen b8e36847a3 cp对账系统退出 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
zhengyongxing a4b53c4e9a 结算单管理字段名修正 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 864e8d693a 优化前端浮点数计算 5 years ago
zhengyongxing 135cba359e 菜单高亮修改 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
liuweiwen 21ee77609c cp/工会对账系统 5 years ago
zhengyongxing 547b0439e3 市场结算添加编辑添加户名 5 years ago
chenzhi 1275c740d5 新增cp对账单删除 5 years ago
zhengyongxing b74ac306ae 市场结算添加编辑添加户名 5 years ago
chenzhi 1bb038db4e 优化查看2 5 years ago
chenzhi f06cddc093 优化查看 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