From 18d292f1091b8b86ad29ba76e3cbe8ffaf2c222e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 11 六月 2025 17:45:39 +0800
Subject: [PATCH] 1.正式库合并以及优化 2.销售模块

---
 basic-server/src/main/java/com/ruoyi/basic/entity/CoalValue.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/entity/CoalValue.java b/basic-server/src/main/java/com/ruoyi/basic/entity/CoalValue.java
index 84b2a8c..7f5848f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/entity/CoalValue.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/entity/CoalValue.java
@@ -1,8 +1,13 @@
 package com.ruoyi.basic.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.deser.std.NumberDeserializers;
 import com.ruoyi.common.core.domain.MyBaseEntity;
+import lombok.Data;
 
 /**
  * 鐓よ川鏂规瀛楁鍊� 瀹炰綋绫�
@@ -20,10 +25,11 @@
      * 涓婚敭ID
      */
     @TableId(value = "id", type = IdType.AUTO)
+    @JsonDeserialize(using = NumberDeserializers.LongDeserializer.class)
     private Long id;
 
     /**
-     * 鍏宠仈閲囪喘鍏ュ簱涓婚敭ID
+     * 鍏宠仈閲囪喘/姝e紡鍏ュ簱涓婚敭ID
      */
     @TableField(value = "plan_id")
     private Long planId;
@@ -43,4 +49,10 @@
     @TableField(value = "field_name")
     private String fieldName;
 
+    /**
+     * 1 閲囪喘/ 2 姝e紡   鍏ュ簱
+     */
+    @TableField(value = "type")
+    private String type;
+
 }
\ No newline at end of file

--
Gitblit v1.9.3