From 3a941e0fc821d879d5f17b41dfc6d9c7688862dc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 15 五月 2026 15:38:12 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_天津_宝东pro
---
src/main/java/com/ruoyi/framework/security/LoginUser.java | 5 ++++-
src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/security/LoginUser.java b/src/main/java/com/ruoyi/framework/security/LoginUser.java
index 330ae43..aad84a9 100644
--- a/src/main/java/com/ruoyi/framework/security/LoginUser.java
+++ b/src/main/java/com/ruoyi/framework/security/LoginUser.java
@@ -301,7 +301,10 @@
public void setUser(SysUser user)
{
this.user = user;
- this.aiEnabled = user == null ? null : user.getAiEnabled();
+ if (user != null && user.getAiEnabled() != null)
+ {
+ this.aiEnabled = user.getAiEnabled();
+ }
}
@Override
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
index 3e64d15..fb36111 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
@@ -14,7 +14,9 @@
private Long id;
@Schema(description = "閿�鍞姤浠峰崟id")
private Long salesQuotationId;
-
+ @Schema(description = "浜у搧Id")
+ @TableField(value = "product_id")
+ private Long productId;
@Schema(description = "鍟嗗搧鍚嶇О")
private String product;
@Schema(description = "鍟嗗搧瑙勬牸")
--
Gitblit v1.9.3