Commit Graph

23 Commits (a19f66868737669bae89202abe63c862f223e13c)

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 2ac6f7ebee upt
yulingwei c1d03cc526 upt
yulingwei bec210c158 修复会员层级关系检索问题
yulingwei c40f5dda26 upt
yulingwei 132dee220a fix
yulingwei f34975478b upt
yulingwei b10717e8b6 upt
yulingwei 18b0c3024d upt
yulingwei ead4a8598e upt
zhengyongxing a6a29bf63a 统计日志添加
yulingwei f4495f93a9 ltv修改
zhengchanglong e08a2eb3ce Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Controller/access_data_foldline.txt
#	Data/update.sql
yulingwei 63d945b4df 修改样式
yulingwei bc7c6b493c 修复问题
yulingwei 36b295919a 修复问题
yulingwei 9f156f7be4 ltv优化
chenzhi 0c62e80e67 优化总览表格高度
chenzhi 768c03c78d 优化总览导出为前端导出
chenzhi e1c29c73af 总览统计结束
chenzhi e27cdc8a38 优化所有统计
ELF 2ffa024c4c initial