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

src/main/java/com/ydtech/modules/order/controller/QrCodeController.java

@@ -78,7 +78,8 @@ public class QrCodeController {
             qrCodeVo.setJqpremium(insAreaCompany.getJqpremium());//交强险
             qrCodeVo.setTaxamount(insAreaCompany.getTaxamount());//车船税
             qrCodeVo.setJypremium(insAreaCompany.getJypremium());//驾驭险
-            qrCodeVo.setCInsuredNme(insOrders.getInsuredname());//投保人
+            qrCodeVo.setCApplyNme(insOrders.getApplyinfo().getString("name"));//投保人
+            qrCodeVo.setCInsuredNme(insOrders.getInsureinfo().getString("name"));//被保人
             qrCodeVo.setCPlateNo(insOrders.getLicenseno());//车牌号
             qrCodeVo.setJqStartDate(insAreaCompany.getJqStartDate());//交强开始时间
             qrCodeVo.setJqEndDate(insAreaCompany.getJqEndDate());//交强结束时间

src/main/java/com/ydtech/modules/order/entity/vo/QrCodeVo.java

@@ -52,9 +52,16 @@ public class QrCodeVo implements Serializable {
      */
     @JsonProperty("jypremium")
     private BigDecimal jypremium;
+
     /**
      * 投保人
      */
+    @JsonProperty("cApplyNme")
+    private String cApplyNme;
+
+    /**
+     * 被保人
+     */
     @JsonProperty("cInsuredNme")
     private String cInsuredNme;
     /**