Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

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

@@ -1912,7 +1912,7 @@
 		        		ORDER BY G.REG_DT DESC, G.GOODS_CD
 		        	</when>
 		        	<otherwise>
-		        		ORDER BY CG.DISP_ORD DESC
+		        		ORDER BY CG.REG_DT DESC
 		        	</otherwise>
 		        </choose>
 		            <if test="maxRow != null and maxRow !=''">