合并分支 'czq' 到 'master'

src/main/java/com/zjty/inspect/controller/InspectController.java

@@ -186,6 +186,20 @@ public class InspectController {
         将马晨俊的数据放入输出的表单
          */
         AssessmentReport assessmentReport = new AssessmentReport();
+        SysScale sysScale = new SysScale();
+        Scale scale = new Scale();
+        //文件数量
+        scale.setNum(inspect.getFileNum());
+        sysScale.setFile(scale);
+        //代码行数
+        Scale scale1 = new Scale();
+        scale1.setNum(inspect.getFileLine());
+        sysScale.setCode(scale1);
+        //模块数
+        Scale scale2 = new Scale();
+        scale2.setNum(reform.getModuleNum());
+        sysScale.setMode(scale2);
+        assessmentReport.setSysScale(sysScale);
         //系统名称
         assessmentReport.setSysName(inspect.getProjectName());
         //软件名称

src/main/java/com/zjty/inspect/entity/Scale.java

@@ -18,10 +18,10 @@ public class Scale {
     /**
      * 数量
      */
-    private Integer num = 10;
+    private Integer num;
 
     /**
      * 备注
      */
-    private String des = "***";
+    private String des;
 }