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

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/ActHxpapplyInfoVo.java

@@ -57,6 +57,10 @@ public class ActHxpapplyInfoVo extends BaseEntity {
     @ApiModelProperty(value = "申购人")
     private String applyUserName;
 
+    /** 申购人头像 */
+    @ApiModelProperty(value = "申购人头像")
+    private String avatar;
+
     /** 化学品申购详细信息 */
     @ApiModelProperty(value = "化学品申购详细信息")
     private List <ActHxpapplyDetailVo> actHxpapplyDetailList = new ArrayList<>();

zd-modules/zd-chemical/src/main/resources/mapper/chemical/ActHxpapplyMapper.xml

@@ -304,6 +304,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.id, a.apply_num, a.apply_reason, a.sub_id, a.apply_status, a.user_id, a.create_by, a.create_time, a.update_by
         , a.update_time, a.remark,
          (select ur.nick_name from sys_user ur where ur.user_id = a.user_id) applyUserName,
+         (SELECT ur.avatar FROM sys_user ur WHERE ur.user_id = a.user_id) avatar,
          st.name subName,st.dept_id deptId
         from act_hxpapply a left join lab_subject st on st.id = a.sub_id
         where a.id = #{id}