整合目前前后端进度

Merged Wenbei Xie requested to merge FrontEnd_new into dev

Merge request reports