Merge remote-tracking branch 'origin/develop_zqc' into develop_rayson

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/controller/app/invoice/vo/InvoiceListRespVO.java

@@ -45,7 +45,7 @@ public class InvoiceListRespVO {
 
     @Schema(description = "支付订单id", example = "32484")
     @ExcelProperty("支付订单id")
-    private Integer payOrderId;
+    private Long payOrderId;
 
     @Schema(description = "发票文件地址")
     @ExcelProperty("发票文件地址")
@@ -53,4 +53,28 @@ public class InvoiceListRespVO {
 
     private Long price;
 
+
+    /**
+     * 单位地址
+     */
+
+    private String enterpriseAddress;
+
+    /**
+     * 单位电话
+     */
+    private String        enterprisePhone;
+
+    /**
+     *企业开户行名称
+     */
+    private String enterpriseBankTitle;
+
+    /**
+     *银行基本户账号
+     */
+    private String        enterpriseBankNo;
+
+
+    private Integer type;
 }

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/controller/app/invoice/vo/InvoiceListSaveReqVO.java

@@ -37,4 +37,31 @@ public class InvoiceListSaveReqVO {
     @Schema(description = "支付订单id", example = "32484")
     private Long payOrderId;
 
+
+
+    /**
+     * 单位地址
+     */
+
+    private String enterpriseAddress;
+
+    /**
+     * 单位电话
+     */
+    private String        enterprisePhone;
+
+    /**
+     *企业开户行名称
+     */
+    private String enterpriseBankTitle;
+
+    /**
+     *银行基本户账号
+     */
+    private String        enterpriseBankNo;
+
+
+    private Integer type;
+
+
 }

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/controller/app/invoice/vo/InvoiceTitleRespVO.java

@@ -45,4 +45,33 @@ public class InvoiceTitleRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+
+    /**
+     * 单位地址
+     */
+
+    private String enterpriseAddress;
+
+    /**
+     * 单位电话
+     */
+    private String        enterprisePhone;
+
+    /**
+     *企业开户行名称
+     */
+    private String enterpriseBankTitle;
+
+    /**
+     *银行基本户账号
+     */
+    private String        enterpriseBankNo;
+
+
+    /**
+     * 0.增值 1.普票
+     */
+    private Integer type;
+
+
 }

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/controller/app/invoice/vo/InvoiceTitleSaveReqVO.java

@@ -31,4 +31,27 @@ public class InvoiceTitleSaveReqVO {
     @NotNull(message = "用户编号不能为空")
     private Long userId;
 
+    private Integer type;
+
+
+    /**
+     * 单位地址
+     */
+    private String enterpriseAddress;
+
+    /**
+     * 单位电话
+     */
+    private String        enterprisePhone;
+
+    /**
+     *企业开户行名称
+     */
+    private String enterpriseBankTitle;
+
+    /**
+     *银行基本户账号
+     */
+    private String        enterpriseBankNo;
+
 }

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/dal/dataobject/invoice/InvoiceListDO.java

@@ -56,10 +56,38 @@ public class InvoiceListDO extends BaseDO {
     /**
      * 支付订单id
      */
-    private Integer payOrderId;
+    private Long payOrderId;
 
     private String fileUrl;
 
     private Long price;
 
+
+
+    /**
+     * 单位地址
+     */
+    private String enterpriseAddress;
+
+    /**
+     * 单位电话
+     */
+    private String        enterprisePhone;
+
+    /**
+     *企业开户行名称
+     */
+    private String enterpriseBankTitle;
+
+    /**
+     *银行基本户账号
+     */
+    private String        enterpriseBankNo;
+
+    /**
+     * 0.增值 1.普票
+     */
+    private Integer type;
+
+
 }

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/dal/dataobject/invoice/InvoiceTitleDO.java

@@ -52,4 +52,30 @@ public class InvoiceTitleDO extends BaseDO {
      */
     private Long userId;
 
+    /**
+     * 单位地址
+     */
+    private String enterpriseAddress;
+
+    /**
+     * 单位电话
+     */
+    private String        enterprisePhone;
+
+    /**
+     *企业开户行名称
+     */
+    private String enterpriseBankTitle;
+
+    /**
+     *银行基本户账号
+     */
+    private String        enterpriseBankNo;
+
+    /**
+     * 0.增值 1.普票
+     */
+    private Integer type;
+
+
 }

menduner/menduner-im-biz/pom.xml

@@ -59,7 +59,7 @@
         <dependency>
             <groupId>com.citu</groupId>
             <artifactId>menduner-system-api</artifactId>
-            <version>2.1.0-snapshot</version>
+            <version>${revision}</version>
             <scope>compile</scope>
         </dependency>