Merge branch 'master-prod-new' into master-test

fhx

2023-10-24 afd50fe9436819584bfca4562c4943f837eaf414

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