Commit Graph

4150 Commits (26038f379e6cdff43e97a6db2bb20b89cbe28a0a)
 

Author SHA1 Message Date
chenzhi cc653c2d2d 优化tp1.id错误
zhengyongxing a968c5dbe4 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing a4b53c4e9a 结算单管理字段名修正
liuweiwen 33397aceb3 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 0694b457bd 更新sql
zhengyongxing 3cf56c0d24 Merge branch 'feature/group_type' into dev
zhengyongxing 0c403ddf57 结算单管理字段名修正
zhengyongxing 72455ab625 Merge branch 'feature/group_type' into dev
zhengyongxing 4d6a45657c Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 73578f1b64 生成下游订单修改
chenzhi 96466100bb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi e024493b4b Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 864e8d693a 优化前端浮点数计算
liuweiwen e9c7580de8 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 4e6555d7fa 更新sql
liuweiwen 64cdea78a3 工会归属管理
zhengyongxing 6baba8db28 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 5d593cf266 Merge branch 'feature/group_type' into dev
zhengyongxing 135cba359e 菜单高亮修改
liuweiwen 537d9840eb Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 7f0dbe1112 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 1e4b7f69d5 cp/工会对账系统
zhengchanglong 73fb719628 Merge branch 'feature/group_type' into dev
zhengyongxing c27518b988 市场结算添加编辑添加户名
zhengchanglong 868fde2d07 Merge branch 'feature/group_type' into dev
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/工会对账系统
zhengchanglong 1c00290da9 Merge branch 'feature/group_type' into dev
# Conflicts:
#	Data/update.sql
chenxiaojun 6a8e58325c 更新
chenxiaojun bfc93e0626 公会分成管理--更新
chenxiaojun d995675829 更新
chenxiaojun 1594500eca 资质认证--更新
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 市场结算管理代码编辑完善
chenxiaojun c42e0be4cd 更新