77

science-admin/src/main/java/com/yiboshi/science/param/dto/ComExpertDTO.java

@@ -118,6 +118,9 @@ public class ComExpertDTO extends BaseDTO {
     /** 用户名 */
     @ApiModelProperty(value = "用户名", position = 22)
     private String username;
+    /** 密码 */
+    @ApiModelProperty(value = "密码", position = 22)
+    private String password;
     /** 用户角色Id*/
     @ApiModelProperty(value = "用户角色Id", position = 30)
     private String userRoleId;

science-admin/src/main/resources/mapper/ComExpertDAO.xml

@@ -9,7 +9,7 @@
         SELECT distinct
         a.*,e.person_name,e.sex,e.cert_id,e.mobile,e.email,e.unit_id,e.work_unit,e.person_state,e.degree,
         d.unit_name,d.unit_type,g.name nation_name,h.name education_name,
-        i.name title_name,f.username,f.id user_id,l.id user_role_id,l.state,
+        i.name title_name,f.username,f.password,f.id user_id,l.id user_role_id,l.state,
         (case l.state when 1 then '启用' else '停用' end) state_name
         FROM com_expert a
         LEFT JOIN com_person e ON a.person_id = e.id