Merge branch 'master-20240326' into test

src/main/java/com/ydtech/aop/GlobalExceptionHandler.java

@@ -36,19 +36,19 @@ public class GlobalExceptionHandler {
     @ResponseBody
     public HttpResult exceptionGet(Exception e) {
         LOGGER.error("【系统异常】{}", e);
-        if (e.getStackTrace() != null && e.getStackTrace().length > 0) {
-            StackTraceElement element = e.getStackTrace()[0];
-            ErrorInfo errorInfo = new ErrorInfo(
-                    element.getClassName(),
-                    element.getFileName(),
-                    element.getMethodName(),
-                    String.valueOf(element.getLineNumber())
-            );
-
-            return HttpResult.error(-9999, errorInfo.toString());
-        }
-
-        return HttpResult.error(-1, "发生错误，请与管理员联系");
+//        if (e.getStackTrace() != null && e.getStackTrace().length > 0) {
+//            StackTraceElement element = e.getStackTrace()[0];
+//            ErrorInfo errorInfo = new ErrorInfo(
+//                    element.getClassName(),
+//                    element.getFileName(),
+//                    element.getMethodName(),
+//                    String.valueOf(element.getLineNumber())
+//            );
+//
+//            return HttpResult.error(-9999, errorInfo.toString());
+//        }
+
+        return HttpResult.error(-9999, "程序异常，请联系管理员");
     }
 
     @ExceptionHandler(value = DescribeException.class)

src/main/java/com/ydtech/modules/ins/model/CardUserInfo.java

@@ -13,8 +13,10 @@ import lombok.Data;
 @Data
 @ApiModel(value = "行驶证用户信息")
 public class CardUserInfo {
+    @ApiModelProperty("总质量")
     private String grossMass;
     private String approvedLoad;
+    @ApiModelProperty("车牌号")
     private String plateNo;
     private String plateType;
     private String remark;
@@ -31,19 +33,30 @@ public class CardUserInfo {
     private String approvedPassengersCapacity;
     private String backOcrID;
     private String motorTypeCode;
+
     private String motorUsageTypeCode;
+
+    @ApiModelProperty("车辆识别代号")
     private String vIN;
+
+    @ApiModelProperty("发证日期")
     private String issueDate;
+
     private String tractionMass;
+
+    @ApiModelProperty("注册日期")
     private String registerDate;
 
-    //新增 核定载质量
+    @ApiModelProperty("核定载质量")
     private String limitLoad;
-    //新增 使用性质
+
+    @ApiModelProperty("使用性质")
     private String useNature;
-    //新增 车辆类型
+
+    @ApiModelProperty("车辆类型")
     private String category;
-    //新增 车辆用途
+
+    @ApiModelProperty("车辆用途")
     private String vehicleUse;
 
     //add 车主 lig 2023-09-21