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

lyfO_o

2021-06-16 b510b274d9003d0a643a43c1e01b1382d84f78ec

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

@@ -129,6 +129,12 @@
    WHERE
   sl.project LIKE CONCAT('%',#{project},'%')
  </select>
  <select id="getSysLaboratoryByName"  resultMap="SysLaboratory">
    select *
    from  sys_laboratory
    where name = #{0}
    and valid_flag = 1
  </select>
  <update id="updateLabExport" parameterType="com.nanometer.smartlab.entity.SysLaboratory">
    update sys_laboratory set
    type=#{type},