Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb

zss

2025-04-18 ec1f20c31d64ddbc5242c3942902bc5233a8a140

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonDto.java

@@ -10,11 +10,8 @@
@Data
public class PersonDto {


    private List<Person> person;

    private List<Company> company;

    private Integer roleId;

}