合并代码处理冲突

puzhibing

2023-07-04 d8bfa0bc04c65929f9f370f2ad1d0b8ff445805d

 cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuDetailsReq.java

@@ -29,8 +29,4 @@

    @ApiModelProperty(value = "身份证号码")
    private String idCard;

    @ApiModelProperty(value = "用户id")
    private Integer userID;

}