From f6fbc4272b4473ed97c36fca81515e74ef05a2c6 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Thu, 17 Oct 2024 10:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E6=A2=B0=E5=B1=82=E7=BA=A7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/service/basic/UdiProductService.java    | 2 +-
 src/main/resources/application-dev.yml                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
index 44b15d9d2..2885e11ff 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
@@ -149,7 +149,7 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
                 diLevelResponse.setPackUnit(udiProductEntity.getPackUnit());
                 diLevelResponse.setBhxjsl(udiProductEntity.getBhxjsl());
                 diLevelResponses.add(diLevelResponse);
-                if (udiProductEntity.getProductsType() == 2 && IntUtil.value(udiProductEntity.getPackLevel()) == 1) {
+                if (IntUtil.value(udiProductEntity.getPackLevel()) == 1) {
                     DiLevelResponse diLevelResponse1 = new DiLevelResponse();
                     diLevelResponse1.setLevelUnit(udiProductEntity.getXjdw());
                     diLevelResponse1.setPackLevel(0);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 794856e96..550f24925 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.206:3306/udiwms81?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Glxp@6066
+    password: 123456
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20