Merge branch 'ty_fix' into alpha

Helius

2021-11-08 ad3f115b29e3c33b32bd38855bdc5b9f2de381b1

 zq-erp/src/main/java/com/matrix/system/app/vo/ShoppingGoodsListVo.java

@@ -1,5 +1,6 @@
package com.matrix.system.app.vo;

import com.matrix.system.hive.bean.ShoppingGoods;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

@@ -84,7 +85,11 @@
    }

    public void setIsPresent(String isPresent) {
        this.isPresent = isPresent;
        if ("是".equals(isPresent)) {
            this.isPresent = "1";
        } else {
            this.isPresent = "0";
        }
    }

    public String getUnit() {