Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-06 b6102728f433cfeb302661a4bff1ab069d182bf0

 phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java

@@ -7,6 +7,8 @@
 */
@Data
public class ConsumablesDto {
    /** 领建id 修改必填必填 */
    private String hisId;

    /** 中文简称  */
    private String aliasCHS;