Merge branch 'fhx-prod-FDD' into master-test

fhx

2024-03-12 4689ea57c0f47bfd9253396eef3e6808e54caf5a

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