Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-07-03 2b919980a8c70554a64cb3d03cc95679af4d817f

 java110-bean/src/main/java/com/java110/vo/api/resourceStore/ApiResourceStoreDataVo.java

@@ -1,7 +1,7 @@
package com.java110.vo.api.resourceStore;

import com.java110.dto.resourceStoreTimes.ResourceStoreTimesDto;
import com.java110.dto.resourceSupplier.ResourceSupplierDto;
import com.java110.dto.resource.ResourceStoreTimesDto;
import com.java110.dto.resource.ResourceSupplierDto;

import java.io.Serializable;
import java.util.Date;
@@ -58,6 +58,8 @@
    //是否是固定物品
    private String isFixed;
    private String isFixedName;

    private String totalPrice;

    private List<ResourceStoreTimesDto> times;
    public String getResId() {
@@ -339,4 +341,12 @@
    public void setTimes(List<ResourceStoreTimesDto> times) {
        this.times = times;
    }

    public String getTotalPrice() {
        return totalPrice;
    }

    public void setTotalPrice(String totalPrice) {
        this.totalPrice = totalPrice;
    }
}