* ȡ�������ʾ��Ϣע��
Merge branch 'genertecPad' of https://github.com/finalljx/viewhome into genertecPad
* �޸ĵ����ڿ����漰����