Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

This commit is contained in:
wangzhijiang
2023-04-15 16:54:15 +08:00
@@ -173,6 +173,8 @@ public class ImportFileUtil {
res = "1"; res = "1";
} else if (str.equals("无")) { } else if (str.equals("无")) {
res = "2"; res = "2";
}else{
res = "3";
} }
} }
return res; return res;
@@ -198,6 +200,8 @@ public class ImportFileUtil {
res = "1"; res = "1";
} else if (str.equals("否")) { } else if (str.equals("否")) {
res = "2"; res = "2";
}else{
res = "3";
} }
} }
return res; return res;