Merge branch 'master' into master-test

wangrenhuang

2023-11-21 1cc34b1ca79017139b79756dcd6247eb47fc41b6

 phis-feign/src/main/java/com/hz/his/dto/user/UserPackListDto.java

@@ -8,5 +8,6 @@
/**人群包用户查询参数*/
@Data
public class UserPackListDto {
    private String fromCode;
    private List<UserPackDto> list;
}