Merge branch 'develop' into jmh

src/main/java/com/style24/persistence/mybatis/shop/TscOrderChange.xml

@@ -4661,7 +4661,14 @@
 		    ON     DDF.ORD_CHG_SQ = ODIH.ORD_CHG_SQ
 		    WHERE  1=1
 		    AND    ODIH.ORD_CHG_SQ = #{ordChgSq}
+		<choose>
+			<when test="chgStat == 'G720_30'">
+		    AND    ODIH.ORD_DTL_STAT IN ('G720_30', 'G720_40')
+			</when>
+			<otherwise>
 		    AND    ODIH.ORD_DTL_STAT = #{chgStat}
+			</otherwise>
+		</choose>
 		) A
 		WHERE  1=1
 		GROUP  BY A.ORD_NO