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

lyfO_o

2021-06-11 e1454a154718e20abbab36d0def4de9124a07254

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

@@ -39,6 +39,15 @@
    </if>
  </select>

  <select id="exportExcelList" parameterType="java.util.Map" resultType="java.util.Map">
    select name,person_name personName,phone,memo from sys_supplier
    where valid_flag = 1
    <if test="name != null and name !=''">
      and  name like concat("%",#{name},"%")
    </if>
    order by name ASC
  </select>

  <insert id="insertBatch" parameterType="java.util.List">
    insert into sys_supplier
    (id,name,person_name,phone,memo,create_time,valid_flag)