Merge remote-tracking branch 'origin/sit' into sit

alien-dining/src/main/java/shop/alien/dining/controller/DiningController.java

@@ -114,6 +114,7 @@ public class DiningController {
             @ApiParam(value = "桌号ID", required = true) @RequestParam Integer tableId) {
         try {
             CuisineDetailVO vo = diningService.getCuisineDetail(cuisineId, tableId);
+            
             return R.data(vo);
         } catch (Exception e) {
             log.error("获取菜品详情失败: {}", e.getMessage(), e);

alien-store/src/main/java/shop/alien/store/service/impl/WeChatMiniProgramQrCodeServiceImpl.java

@@ -295,6 +295,6 @@ public class WeChatMiniProgramQrCodeServiceImpl implements WeChatMiniProgramQrCo
                 storeId, tableId, System.currentTimeMillis());
 
         // 生成二维码并上传，扫码后打开指定页面
-        return generateQrCodeAndUpload(scene, "pages/index/index", 430, ossPath);
+        return generateQrCodeAndUpload(scene, "pages/launch/index", 430, ossPath);
     }
 }