Commit Graph

43 Commits (80597c48945e7910279e3397d4aa28eb8438ca27)

Author SHA1 Message Date
zhengyongxing b768d41935 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
 Conflicts:
	Application/Home/Controller/PackageController.class.php
zhengyongxing 001e9e70f8 管理后台导出权限添加
yulingwei 8fc1199e79 upt
yulingwei c3cb357e1c upt
yulingwei 872a76356d upt
yulingwei 42026e753a upt
yulingwei 312448c724 upt
yulingwei c1d03cc526 upt
yulingwei 82620c9ae6 merge
yulingwei bec210c158 修复会员层级关系检索问题
廖金灵 43562f6746 Merge branch 'feature/download_type_list' of wmtx/platform into release
修复检索问题
yulingwei c40f5dda26 upt
zhengyongxing 1987fcd865 ios下载账号隐藏中间部分
zhengyongxing b32910a79e ios下载账号隐藏中间部分
yulingwei a2ab7b1c66 merge
yulingwei 1ad299ffbe 修复统计问题
yulingwei f34975478b upt
yulingwei b10717e8b6 upt
yulingwei ead4a8598e upt
yulingwei f4495f93a9 ltv修改
yulingwei 873c81605e 修复
yulingwei 12f00ad268 修复
chenzhi 0ef4241570 合并statistcs
chenzhi 86db958ca7 将txt文件全部移入runtime
zhengchanglong e08a2eb3ce Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Controller/access_data_foldline.txt
#	Data/update.sql
yulingwei bc7c6b493c 修复问题
yulingwei d1bc94e438 修改问题
yulingwei cd34df0bda 修改时间统计
yulingwei 9f156f7be4 ltv优化
chenzhi dbc77d07e7 优化聚合排序
chenzhi cfa67f9e3e 总览统计结束
chenzhi e1c29c73af 总览统计结束
chenzhi e763abbf92 123.
chenzhi 68d23b469c 123
chenzhi 6bc0cdcf1e 123
chenzhi 1c9ed4b2ba 优化统计
chenzhi 9962366ab9 暂存修改
chenzhi ce20d48d57 总览-推广员聚合及展示
chenzhi ae03347437 123
chenzhi 31fa9fe1f1 123
chenzhi e27cdc8a38 优化所有统计
yulingwei 2e0a8d2ad0 更新统计数据
ELF 2ffa024c4c initial