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

rx

2024-08-05 d621324bcf6c5a26f058b24e0f4d2930f41840f4

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