From 51c5e8855a90afc8dbcb1a9571b7ab51334814b2 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 14 五月 2026 00:07:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_鹤壁_强信宇_pro
---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index f0e9470..8c0dc07 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -38,7 +38,6 @@
private String model;
@Excel(name = "浜у搧缂栫爜")
- @TableField("product_code")
private String productCode;
/**
--
Gitblit v1.9.3