Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-02 05f71eff9a356615db7629e8a439d451dfab60f7

 src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml

@@ -31,6 +31,9 @@
    <if test="department != null and department != ''">
      and su.department = #{department}
    </if>
    <if test="project != null and project != ''">
      and su.project like concat("%",#{project},"%")
    </if>
  </sql>

  <select id="getSysLaboratory" parameterType="java.lang.String"  resultMap="SysLaboratory" >