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

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java

@@ -391,34 +391,51 @@ public class BillInfo extends BaseEntity
     private List<Jzfwxx> jzfwList; // 建筑服务信息
 
 
-
-
     @TableField(exist=false)
     private String jdcbz; // 机动车标志
 
-
+    @TableField(exist=false)
     /** 车辆类型*/
     private String vehicleKind;
+
+    @TableField(exist=false)
     /** 厂牌型号*/
     private String brandModel;
+
+    @TableField(exist=false)
     /** 产地*/
     private String originPlace;
+
+    @TableField(exist=false)
     /** 合格证号*/
     private String qualityCertificate;
+
+    @TableField(exist=false)
     /** 进口证明书号*/
     private String impCertificateNo;
+
+    @TableField(exist=false)
     /** 商检单号*/
     private String commInspectionNo;
+
+    @TableField(exist=false)
     /** 发动机号*/
     private String vehicleNo;
+
+    @TableField(exist=false)
     /** 生产企业名称*/
     private String ManufacturerName;
+
+    @TableField(exist=false)
     /** 价税合计*/
     private String amountTaxTotal;
+
+    @TableField(exist=false)
     /** 限乘人数*/
     private String peopleNo;
     /** 单据编号*/
 //    private String documentNr;
+    @TableField(exist=false)
     /** 机动车发票票面版式标志*/
     private String InfoClientAddressPhone;
 

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillInfoDTO.java

@@ -471,4 +471,29 @@ public class HxBillInfoDTO extends BillInfo {
     private String YSXWFSD; // 应税行为发生地
 
 
+    /** 机动车新加 start*/
+    private String jdcbz; // 机动车标志
+    /** 车辆类型*/
+    private String vehicleKind;
+    /** 厂牌型号*/
+    private String brandModel;
+    /** 产地*/
+    private String originPlace;
+    /** 合格证号*/
+    private String qualityCertificate;
+    /** 进口证明书号*/
+    private String impCertificateNo;
+    /** 商检单号*/
+    private String commInspectionNo;
+    /** 发动机号*/
+    private String vehicleNo;
+    /** 生产企业名称*/
+    private String ManufacturerName;
+    /** 价税合计*/
+    private String amountTaxTotal;
+    /** 限乘人数*/
+    private String peopleNo;
+    /** 机动车新加 end*/
+
+
 }