Merge branch 'master' into master-test

fwq

2023-10-24 eab899c4fe225961e5ccf43ea8db67af4efb4284

 phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java

@@ -9,6 +9,5 @@
 **/
@Data
public class DConsumablesDto extends DCommonDto {


    private Integer type;
}