Merge branch 'master' into master-test

wangrenhuang

2023-11-13 499737916d0cb59092c04d6523d4607ff0a5556a

 phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java

@@ -10,7 +10,6 @@
@Data
public class DVisitRecordDto extends DCommonDto {

    private String userId;
    private String shopId;
    private String preTypeName;
    private String doctorName;