Merge branch 'master-v32-lushangqing' into 'master'

资源统计下面展示不足四个时，补的名称‘其他’改为‘暂无’



See merge request !397

@@ -52,7 +52,7 @@ export default {
                             resData.push({
                                 "resTypeAllNum": 0,
                                 "code": "other",
-                                "name": "其他",
+                                "name": "暂无",
                                 "excellentNum": 0,
                                 "middleNum": 0,
                                 "goodNum": 0,