Merge remote-tracking branch 'origin/dev/db-up' into dev/db-up

src/main/resources/application-mysql8.yml

@@ -121,10 +121,10 @@ sftp:
 #查询备用数据库
 dynamic:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.16.20.104:3306/tcwm2.5?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&serverTimezone=CTT
+    url: jdbc:mysql://172.22.45.21:3306/tcwm2.5?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&serverTimezone=CTT&useAffectedRows=true
     #    url: jdbc:mysql://172.16.20.108:3306/tcwm2.5?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&serverTimezone=CTT
     username: root
-    password: ch@2025.wm
+    password: Chuanghai2024.
     #    password: chuanghai@2024
     initial-size: 15
     max-active: 100

src/main/resources/mapper/goods/GoodsMapper.xml

@@ -126,7 +126,7 @@
         FROM (
             SELECT
                 g.*,
-                ROW_NUMBER() OVER (PARTITION BY g.shop_id ORDER BY g.sort asc, g.sales_volume desc) AS rank
+                ROW_NUMBER() OVER (PARTITION BY g.shop_id ORDER BY g.sort asc, g.sales_volume desc) AS `rank`
             FROM
                 goods g
             WHERE g.status=0