Merge branch 'master' into master-test

wangrenhuang

2023-11-13 499737916d0cb59092c04d6523d4607ff0a5556a

 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;
}