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

lyfO_o

2021-09-16 074c6c4389938fc38e82b6258b8ebab95fb5aff9

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

@@ -62,7 +62,7 @@
    <if test="name != null and name != ''">
      and sc.controller_name like concat ("%",#{name},"%")
    </if>
    order by create_time desc
    order by sc.create_time desc
  </select>

  <insert id="insertSysController" parameterType="com.nanometer.smartlab.entity.SysController">