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

gdg

2021-02-23 8b6a2a67a0bf081252648ba46fffd5591b3afc98

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

@@ -264,7 +264,7 @@
    <if test="productSn != null and productSn != ''">
      and sr.product_sn like concat("%", #{productSn} ,"%")
    </if>
    ORDER BY sr.create_time desc
    ORDER BY length(sr.name),sr.create_time desc
    <if test="first != null and pageSize != null">
      limit #{first}, #{pageSize}
    </if>