Merge remote-tracking branch 'origin/master'

fuliqi

2024-10-29 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d

 src/main/java/com/ycl/jxkg/domain/form/EditClassesUserForm.java

@@ -46,11 +46,13 @@

    @NotBlank(message = "请填写学员登录账号", groups = {Add.class, Update.class})
    @ApiModelProperty("登录账号")
    private String account;
    private String userName;

    @ApiModelProperty("登录密码")
    private String password;

    private String birthDay;

    public static ClassesUser getEntityByForm(@NonNull EditClassesUserForm form, ClassesUser entity) {
        if(entity == null) {
          entity = new ClassesUser();