添加默认打包资源
Merge remote-tracking branch 'upstream/dev' into dev