70 Commits (daec62ec958a04dfca7d032accf4d27519fd6d85)

Author SHA1 Message Date
zhengyongxing 061d7373fb 市场结算管理内外团新增内团分发 5 years ago
yulingwei e26f517df1 冲突解决 5 years ago
yulingwei dfe52865bd upt 5 years ago
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
5 years ago
liuweiwen a1c3ad8fb3 数据展示权限 5 years ago
sunke 3dbacf225b 指标下载处理 5 years ago
sunke ffd29e2662 指标导出处理 5 years ago
zhengyongxing f51a576b1d Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing 9ab70c84d8 市场结算管理下游结算审核状态添加 5 years ago
zhengyongxing 0cbd58862e Merge branch 'release' of 47.111.118.107:wmtx/platform into release
 Conflicts:
	Data/update.sql
5 years ago
zhengyongxing 8a1a15e845 市场结算管理下游结算符号bug修正 5 years ago
sunke 739eff3d00 删除打印 5 years ago
sunke f92533e6a5 渠道计算修复 5 years ago
sunke 5fe238ccbd 渠道流水计算 5 years ago
sunke 2d0cc98077 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/channel_fee 5 years ago
chenxiaojun e9581a2e04 管理后台>推广员>结算管理>推广提现--更新 5 years ago
sunke 56981a0acc 渠道计算 5 years ago
chenxiaojun 2c52bccaf7 管理后台>推广员>结算管理>推广提现>自动审核管理--更新 5 years ago
chenxiaojun d5a63a7849 管理后台>推广员>结算管理>推广提现>自动审核管理--更新 5 years ago
chenxiaojun a7891d6b57 管理后台>推广员>结算管理>推广提现--部分功能优化 5 years ago
chenxiaojun 73f1055303 管理后台>推广员>结算管理>推广提现--增加自动审核功能 5 years ago
chenxiaojun b367b4a8d3 公会分成管理--更新 5 years ago
zhengyongxing 3741b0d27f 市场结算修正 5 years ago
zhengyongxing 1ba566a02c 市场结算修正 5 years ago
zhengyongxing 9d5b877220 市场结算生成下游代码修改 5 years ago
chenxiaojun 6e05546db6 公会分成管理--更新 5 years ago
zhengyongxing 4c42ee90e3 市场结算生成下游对账单代码优化 5 years ago
zhengyongxing f86265d38c 市场结算管理设备类型条件修正 5 years ago
zhengchanglong d054e70c73 Merge branch 'release' into dev
# Conflicts:
#	Application/Admin/Controller/MemberController.class.php
#	Application/Admin/View/Promote/belong_edit.html
5 years ago
chenxiaojun 63d947f754 推广提现--更新 5 years ago
zhengyongxing 076daf0d4e query冲突解决 5 years ago
ELF c4934613ae 解决冲突 5 years ago
ELF 0f44d9e95c 解决冲突 5 years ago
chenzhi dbc0e00132 合并 5 years ago
zhengyongxing 71f2d75b8e 市场结算管理总流水点击查看各个渠道的流水 5 years ago
zhengyongxing 7f99dafb2c 市场结算管理 上游结算流水bug修正 5 years ago
zhengyongxing ae2ad86247 Merge branch 'feature/group_type' into dev 5 years ago
zhengyongxing 3c9a828537 市场结算官方渠道检索修正 5 years ago
chenxiaojun 4a53915c22 更新 5 years ago
chenxiaojun 82784f9da9 推广提现--更新 5 years ago
chenxiaojun 009842c218 更新 5 years ago
chenxiaojun 4286817dea 推广提现--更新 5 years ago
chenxiaojun 3a9a7177fe 推广结算--更新 5 years ago
chenxiaojun ad80923bed 更新 5 years ago
chenxiaojun 114cb2f7a5 更新 5 years ago
chenxiaojun f244b42ab7 推广结算--更新 5 years ago
zhengchanglong 505e12beab Merge branch 'feature/group_type' into dev 5 years ago
zhengyongxing ba158e6b9a 市场结算管理上传 5 years ago
chenzhi 377bdaee72 合并gt 5 years ago
zhengyongxing 5e14eaf4c9 新增市场结算管理完善 5 years ago