Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2021-11-25 af25588b88a727b6c945796e3cf34ed3d4f05e89

 ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -92,6 +92,7 @@
      <if test="genTable.params.endTime != null and genTable.params.endTime != ''"><!-- 结束时间检索 -->
         AND date_format(create_time,'%y%m%d') &lt;= date_format(#{genTable.params.endTime},'%y%m%d')
      </if>
      order by create_time desc
   </select>