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

src/main/java/com/ydtech/modules/order/entity/api/yangguang/request/YangGuangAccuracyCalculateRequest.java

@@ -495,16 +495,16 @@ public class YangGuangAccuracyCalculateRequest extends YangGuangBaseRequest {
             this.Name = customerInfoVo.getName();
             this.Mobile = customerInfoVo.getMobile();
             this.OwnerAdress = customerInfoVo.getAddr();
-            if (customerInfoVo.getProperty() != null && customerInfoVo.getProperty().equals("1")) {
-                this.InsuredType = "0";
-                this.IdentifyType = "01";
-                this.CarInsuredRelation = "1";
-                this.IdentifyNumber = customerInfoVo.getIdentifyNumber();
-            } else if (customerInfoVo.getProperty() != null && customerInfoVo.getProperty().equals("0")) {
+            if ("0".equals(customerInfoVo.getProperty())) {
                 this.IdentifyType = "09";
                 this.InsuredType = "2";
                 this.CarInsuredRelation = "1";
                 this.IdentifyNumber = customerInfoVo.getOrganizationCode();
+            }else {
+                this.InsuredType = "0";
+                this.IdentifyType = "01";
+                this.CarInsuredRelation = "1";
+                this.IdentifyNumber = customerInfoVo.getIdentifyNumber();
             }
         }
     }