Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

 phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java

@@ -11,5 +11,12 @@
    /**项目关联类型,不传默认项目sku*/
    private Integer type;
    /**公共标识*/
    private Integer commonId;
    private String commonId;

    /**类型-项目SKU*/
    public static final Integer TYPE_SKU = 0;
    /**类型-项目SPU*/
    public static final Integer TYPE_SPU = 1;
    /**类型-项目所属末级分类*/
    public static final Integer TYPE_TYPE = 2;
}