Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-07 50a170ab1b38e97063e7a32da51e07b939638e8d

 src/main/resources/mapper/CmsTemplateMapper.xml

@@ -14,6 +14,9 @@

    <delete id="delete">
        delete from cms_template
        where id=#{id} and company_id=#{companyId}
        where id=#{id}
          <if test="companyId != null and companyId != 0">
              and company_id=#{companyId}
          </if>
    </delete>
</mapper>