From bbb0549af4352a189c1c59a31ce60269806929b2 Mon Sep 17 00:00:00 2001
From: kk <1910333201@qq.com>
Date: Fri, 20 Oct 2023 09:32:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=B1=BD=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml        | 12 ++++++------
 .../console/AisinoConsoleInvoiceAddDTO.java       | 15 +++++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/jianshui-admin/src/main/resources/application-dev.yml b/jianshui-admin/src/main/resources/application-dev.yml
index ede1c17..f27c688 100644
--- a/jianshui-admin/src/main/resources/application-dev.yml
+++ b/jianshui-admin/src/main/resources/application-dev.yml
@@ -9,13 +9,13 @@ spring:
     druid:
       # 主库数据源
       master:
-#        url: jdbc:mysql://81.70.100.158:3306/jianshui_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        url: jdbc:mysql://58.87.71.213:3306/bid_jianshui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://81.70.100.158:3306/jianshui_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        url: jdbc:mysql://58.87.71.213:3306/bid_jianshui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #        url: jdbc:mysql://58.87.71.213:3306/jianshui_dev_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#        username: jianshui_dev
-        username: bid_jianshui
-#        password: tHsWetXEjYFJsdAC
-        password: ts3D5zYkFzcxbrPc
+        username: jianshui_dev
+#        username: bid_jianshui
+        password: tHsWetXEjYFJsdAC
+#        password: ts3D5zYkFzcxbrPc
 #        password: kaMSddCzO54qtIg0I9N8iKA2iSFrm8YdBK55Zxdjxy8Zuo7+GoRcZHUOI9UmY1JtrMP6wA//Bftj8oq8zRbbPA==
           # 从库数据源
       slave:
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java
index a3d916b..625efcf 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java
@@ -28,12 +28,6 @@ public class AisinoConsoleInvoiceAddDTO {
     @Alias("buyerName")
     private String customerName;
 
-    /**
-     * 机动车-购方名称
-     */
-    @NotEmpty
-    @Alias("buyerName")
-    private String infoClientName;
 
     /**
      * 购方税号
@@ -113,8 +107,17 @@ public class AisinoConsoleInvoiceAddDTO {
      */
     private Double quantity;
 
+
+
     // 机动车发票开具新增字段start
 
+    /**
+     * 机动车-购方名称
+     */
+//    @NotEmpty
+    @Alias("buyerName")
+    private String infoClientName;
+
     /** 身份证号码/组织机 构代码*/
     private String IDCard;