Merge branch 'master' into master-test

zhangxu

2022-11-23 1c744733a032b1da5d429830268a6314b39eba09

 phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDetailBo.java

@@ -1,6 +1,8 @@
package com.hz.phis.dt.project;

import com.hz.phis.dt.BaseDt;
import com.hz.phis.dt.spec.SkuGroupSpecDt;
import com.hz.phis.dt.spec.SkuSpecDt;
import lombok.Data;

import java.math.BigDecimal;
@@ -29,6 +31,8 @@
    private List<ProjectSpecsBo> projectSpecsBoList;
    /**sku信息*/
    private List<String> skuIdList;
    /**sku规格信息*/
    private List<SkuGroupSpecDt> skuSpecsBoList;
    /**规格*/
    private String specification;
    /**其他规格*/