elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,690 Commits
1 Branch
0 Tags
173 MiB
Commit Graph

1491 Commits (f507dde70b23be9ec2339b5b352b9d4c800dbf95)

Author SHA1 Message Date
zhengyongxing f86265d38c 市场结算管理设备类型条件修正
zhengyongxing 38cea3f972 用户列表导出锁定备注bug修正
chenxiaojun 63d947f754 推广提现--更新
chenxiaojun 517d4ec05f 公会分成管理--更新
chenxiaojun 48ca90bbf3 公会分成管理--更新
zhengyongxing 43a335bc28 市场结算管理总流水弹窗优化
liuweiwen c8b184b877 Merge remote-tracking branch 'origin/release' into release
liuweiwen 86fe5f1f9f 工会归属admin不加密推广员账号
zhengyongxing 16814af0d2 市场结算管理总流水弹窗优化
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 用户信息小号隐藏
liuweiwen 822ec35ff8 Merge branch 'feature/group_type' into release
liuweiwen 2b3099a2d8 工会归属会长不可编辑
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release
ELF f7a53c7562 Merge branch 'feature/account_safe' into release
ELF b0bc4c0496 解决冲突
ELF 0f44d9e95c 解决冲突
zhengchanglong bb08c723a3 Merge branch 'feature/group_type' into release-1.0.1
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 市场结算管理总流水点击查看各个渠道的流水
chenxiaojun d615a1402f 公会分成管理--更新
liuweiwen b8e36847a3 cp对账系统退出
liuweiwen 57a1d8ed8c 对账系统
zhengyongxing f36202486d 生成上游订单修改
zhengyongxing 2f1d5fbd38 生成上游订单修改
chenzhi 0f8da4afac 优化页面显示
chenzhi 9c1cb95290 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 41421a9b10 优化页面显示
liuweiwen ed706c1b86 公司信息管理加提示
zhengyongxing 7f99dafb2c 市场结算管理 上游结算流水bug修正
liuweiwen a7e9f62367 对账系统自动登录
liuweiwen 51844a824e 工会归属会长必填
liuweiwen e2095af7a8 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 49e0e19cc8 推广员与合作公司只能看到自己的公司的对账记录
zhengchanglong 6e405febc1 设置分成比例安卓IOS同步更新
zhengyongxing 8b4c641f02 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 3c9a828537 市场结算官方渠道检索修正
chenzhi 5996b5f45e Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi cc653c2d2d 优化tp1.id错误
zhengyongxing a4b53c4e9a 结算单管理字段名修正
zhengyongxing 0c403ddf57 结算单管理字段名修正
zhengyongxing 4d6a45657c Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 73578f1b64 生成下游订单修改
chenzhi 864e8d693a 优化前端浮点数计算
zhengyongxing 6baba8db28 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 135cba359e 菜单高亮修改
liuweiwen 7f0dbe1112 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 1e4b7f69d5 cp/工会对账系统
zhengyongxing c27518b988 市场结算添加编辑添加户名
zhengyongxing 26c7190654 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing ef53562d06 市场结算添加编辑添加户名
chenzhi 8ff8d1dab8 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi ac0405329f 优化编辑
liuweiwen 21ee77609c cp/工会对账系统
chenxiaojun bfc93e0626 公会分成管理--更新
zhengyongxing 547b0439e3 市场结算添加编辑添加户名
chenzhi 1275c740d5 新增cp对账单删除
zhengyongxing da420ceb5c 市场结算添加编辑添加户名
zhengyongxing b74ac306ae 市场结算添加编辑添加户名
chenzhi 1bb038db4e 优化查看2
chenzhi 89d21c6218 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f06cddc093 优化查看
zhengyongxing 2b335ec910 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 45ea27fd1f 市场结算列表删除操作
chenzhi cba3fc898c 新增查看
liuweiwen fc5db0b298 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 
# Conflicts:
#	Application/Admin/Controller/AjaxController.class.php
#	Data/update.sql
liuweiwen 394a3e4bb5 cp/工会对账系统
zhengyongxing 6bda9fe842 市场结算管理代码编辑完善
zhengyongxing ad901c31db 市场结算管理代码编辑完善
zhengyongxing 99f23254ed 市场结算管理代码提交
zhengyongxing 68312cc277 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 71b1498c71 市场结算管理代码提交
chenzhi 25240227e4 新增编辑
chenxiaojun 82784f9da9 推广提现--更新
chenxiaojun 9b47108400 推广提现--更新
chenxiaojun 843c54ced5 推广提现--更新
yulingwei 7ea2a465bf 修复问题