合并分支 'wyl' 到 'master'

src/main/java/com/zjty/inspect/utils/WorkLoadUtil.java

@@ -405,9 +405,9 @@ public class WorkLoadUtil {
         }
         report.getTechnologyList().setDes(string.substring(0,string.length()-1)+"。");
         String type = "";
-        if(report.getType()==2){
+        if(report.getType()==1){
             type = "改造";
-        }else if(report.getType()==1){
+        }else if(report.getType()==2){
             type = "适配";
         }
         String workloadDes = "本系统通过选择"+type+"方式部署到国产化安全自主可控环境上。代码层面的关键工作量包含"+nf.format(totalWorkload)+"人工月（包含对不可预见的估算）";