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

java110

2023-03-29 0b04f664887c73e90bf684a4e69c0fdbfe26349d

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

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

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

import java.io.Serializable;
@@ -58,6 +59,7 @@
    private String isFixed;
    private String isFixedName;

    private List<ResourceStoreTimesDto> times;
    public String getResId() {
        return resId;
    }
@@ -329,4 +331,12 @@
    public void setIsFixedName(String isFixedName) {
        this.isFixedName = isFixedName;
    }

    public List<ResourceStoreTimesDto> getTimes() {
        return times;
    }

    public void setTimes(List<ResourceStoreTimesDto> times) {
        this.times = times;
    }
}