From f144f132f49ab143fe258c529770eb4ba4322216 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Fri, 27 Aug 2021 16:44:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/common/util/ValidUtil.java  | 10 +++++-----
 .../com/jero/company/entity/PayCompanyManagement.java  |  2 +-
 .../com/jero/company/entity/PayContactsManagement.java |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java
index ea5f1eee..cff7a0b2 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java
@@ -57,9 +57,9 @@ public class ValidUtil {
      * @Return
      * @Exception
      */
-    public static StringBuilder validateAll(Object object,Class<?>... groups){
+    public static StringBuilder validateAll(Object object){
         StringBuilder msg = new StringBuilder();
-        Set<ConstraintViolation<Object>> set = validatorAll.validate(object, Default.class);
+        Set<ConstraintViolation<Object>> set = validatorAll.validate(object);
         if(set != null && set.size() >0 ){
             for(ConstraintViolation<Object> constraintViolation : set){
                 // 这里循环获取错误信息，可以自定义格式
@@ -76,10 +76,10 @@ public class ValidUtil {
     * @Return
     * @Exception
     */
-    public static StringBuilder validateExcel(Object object, int count,Class<?>... groups){
+    public static StringBuilder validateExcel(Object object, int count){
         StringBuilder msg = new StringBuilder();
-        Set<ConstraintViolation<Object>> set = validatorAll.validate(object, Default.class);
-        if(set != null && set.size() >0 ){
+        Set<ConstraintViolation<Object>> set = validatorAll.validate(object);
+        if(set != null && set.size() > 0 ){
             for(ConstraintViolation<Object> constraintViolation : set){
                 // 这里循环获取错误信息，可以自定义格式
                 msg.append("第").append(count).append("行:").append(constraintViolation.getMessage()).append("</br>");
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
index fab77d82..87b9ab9e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
@@ -31,7 +31,7 @@ public class PayCompanyManagement implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
-	@TableId(type = IdType.ASSIGN_UUID)
+	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private String id;
 	/**企业名称*/
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java
index 555da0bc..a0902dfe 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java
@@ -32,7 +32,7 @@ public class PayContactsManagement implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
-	@TableId(type = IdType.ASSIGN_UUID)
+	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private String id;
 	/**企业id*/