Merge branch 'master_after20' into master_cj_zq

@@ -83,7 +83,7 @@
                         SELECT 1
                         FROM customer_develop_plan cdp
                         WHERE cdp.customer_id = c.id
-                        AND cdp.status != 'CANCEL'
+                        AND cdp.status != '4'
                         )
                     </when>
                     <otherwise>