Merge branch 'master_after20' into master_cj_zq

@@ -42,7 +42,7 @@
             </if>
             </if>
         </where>
         </where>
         ORDER BY
         ORDER BY
-        CASE factory_code
+        CASE tb.code
         WHEN 'yfc' THEN 1
         WHEN 'yfc' THEN 1
         WHEN 'efc' THEN 2
         WHEN 'efc' THEN 2
         WHEN 'sfc' THEN 3
         WHEN 'sfc' THEN 3