Merge branch 'master_after20' into master_cj_zq

@@ -48,6 +48,6 @@
         WHEN 'sfc' THEN 3
         WHEN 'sfc' THEN 3
         WHEN 'ztfc' THEN 4
         WHEN 'ztfc' THEN 4
         ELSE 999
         ELSE 999
-        END;
+        END
     </select>
     </select>
 </mapper>
 </mapper>