From 17e7ce75c805e6bbb2dec4deb38b936733252cd6 Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Tue, 19 Dec 2023 10:28:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(material):=20=E7=BA=A6=E5=AE=9A=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java      | 3 +++
 .../java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java b/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java
index 03e651d..17141b2 100644
--- a/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java
+++ b/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java
@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -39,6 +41,7 @@ public class LocalMaterial extends Model<LocalMaterial> {
 
     @ApiModelProperty("材料id")
     @TableField("MATERIAL_ID")
+    @JsonProperty(value = "material_id")
     private String materialId;
 
     @ApiModelProperty("规格")
diff --git a/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java b/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java
index 09d69b6..09623bc 100644
--- a/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java
+++ b/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java
@@ -2,6 +2,7 @@ package mjkf.xinke.main.model.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jgy.xxs.core.http.exp.NcHttpException;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,6 +15,7 @@ public class MaterialCreateRequest {
     private String id;
 
     @ApiModelProperty("父级id")
+    @JsonProperty(value = "parent_id")
     private String parentId;
 
 //    @ApiModelProperty("分类1")
@@ -41,6 +43,7 @@ public class MaterialCreateRequest {
     private Integer tax;
 
     @ApiModelProperty("是否树")
+    @JsonProperty(value = "is_tree")
     private Integer isTree;
 
     public void check() throws Exception{