From 29292c54edd31bb12899ae31a3abb406fef07ad9 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 18 Oct 2024 16:36:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ysk/cashier/cons/domain/TbConsInfo.java   | 19 ++++---------------
 .../cons/service/dto/TbConsInfoDto.java       |  1 +
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java
index 9d06b59d..60043f2a 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java
@@ -1,18 +1,3 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
 package cn.ysk.cashier.cons.domain;
 
 import cn.ysk.cashier.utils.JSONUtil;
@@ -63,6 +48,10 @@ public class TbConsInfo implements Serializable {
     @ApiModelProperty(value = "库存值")
     private BigDecimal stockNumber;
 
+    @Column(name = "`balance`")
+    @ApiModelProperty(value = "实际库存值")
+    private BigDecimal balance;
+
     @Column(name = "`con_unit`")
     @ApiModelProperty(value = "单位值")
     private String conUnit;
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbConsInfoDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbConsInfoDto.java
index 5821dd6d..d4773b5b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbConsInfoDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbConsInfoDto.java
@@ -48,6 +48,7 @@ public class TbConsInfoDto implements Serializable {
 
     /** 库存值 */
     private BigDecimal stockNumber;
+    private BigDecimal balance;
 
     /** 单位值 */
     private String conUnit;