Merge branch 'master' into develop

code-generator/src/main/resources/template/mapper.ftl

@@ -75,7 +75,7 @@ ${table_name}（${table_comment}）
 
     <!-- 通用删除记录 -->
     <delete id="delete">
-        delete from ${table_name} a
+        delete a from ${table_name} a
         <include refid="common_where"/>
     </delete>