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

src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentUserDto.java

@@ -30,7 +30,7 @@ public class AddBaseStudentUserDto {
      * 性别
      */
     @ApiModelProperty("性别")
-    private Integer gender;
+    private String gender;
     /**
      * 手机号
      */

src/main/java/com/xjrsoft/module/student/service/impl/PbCseFeeobjupdateServiceImpl.java

@@ -52,7 +52,8 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
                 .distinct()
                 .selectAs(PbCseFeeobjupdate::getSpecname, PbCseFeeobjupdate::getSpecname)
                 .selectAs(PbCseFeeobjupdate::getPersonalid, PbCseFeeobjupdate::getPersonalid)
-                .selectAs(PbCseFeeobjupdate::getResourcename, PbCseFeeobjupdate::getResourcename)
+                .select("IFNULL(resourcename,'无') Resourcename")
+//                .selectAs(PbCseFeeobjupdate::getResourcename, PbCseFeeobjupdate::getResourcename)
                 .selectAs(PbCseFeeobjupdate::getQuartername, PbCseFeeobjupdate::getQuartername)
                 .selectAs(PbCseFeeobjupdate::getSex, PbCseFeeobjupdate::getSex)
                 .eq(dto.getYear() != null, PbCseFeeobjupdate::getEnteryear, dto.getYear())

src/main/java/com/xjrsoft/module/teacher/dto/AddXjrUserDto.java

@@ -47,7 +47,7 @@ public class AddXjrUserDto implements Serializable {
     * 性别
     */
     @ApiModelProperty("性别")
-    private Integer gender;
+    private String gender;
     /**
     * 手机号
     */

src/main/java/com/xjrsoft/module/teacher/dto/UpdateXjrUserDto.java

@@ -52,7 +52,7 @@ public class UpdateXjrUserDto implements Serializable {
     * 性别
     */
     @ApiModelProperty("性别")
-    private Integer gender;
+    private String gender;
     /**
     * 手机号
     */