Merge remote-tracking branch 'origin/master-prod-new' into master-test

ANDRU-PC\Andru

2023-10-20 1cc890a6f7432147c633e2cf7c3d4043460e85e9

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