Merge remote-tracking branch 'origin/master'

xuhy

2024-10-26 818cb6acf1167a6ef5f9d1fbf3fb2df390ddf037

Merge remote-tracking branch 'origin/master'

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml

@@ -196,8 +196,8 @@
                </if>
            </if>
        </if>
                    ) a
        order by a.create_time DESC
                    )
        order by createTime DESC
    </select>