Merge branch 'ww' into test

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;

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;