Merge remote-tracking branch 'origin/dev' into dev

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -44,7 +45,7 @@ public class MaType extends BaseEntity {
 
     /** 实时库存 */
     @ApiModelProperty(value = "实时库存")
-    private String num;
+    private BigDecimal num;
 
     /** 计量单位id */
     @ApiModelProperty(value = "计量单位id")
@@ -215,11 +216,11 @@ public class MaType extends BaseEntity {
         this.status = status;
     }
 
-    public String getNum() {
+    public BigDecimal getNum() {
         return num;
     }
 
-    public void setNum(String num) {
+    public void setNum(BigDecimal num) {
         this.num = num;
     }