Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

liu

昨天 c6ce881a26895edc9e89aea8317be15572f48b23

1
2
3
declare const __APP_LOGO__: string;
declare const __APP_FAVICON__: string;
declare const __APP_NAME__: string;