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

mitao

2025-11-04 270a3c0208001e2db9577cb6d7d4fd7ec646dfd8

 cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java

@@ -363,12 +363,11 @@
    })
    public ResultUtil reservationSite(ReservationSite reservationSite) {
        try {
//            Integer uid = tokenUtil.getUserIdFormRedis();
//            if (null == uid) {
//                return ResultUtil.tokenErr();
//            }
            Integer uid = 201;

            Integer uid = tokenUtil.getUserIdFormRedis();
            if (null == uid) {
                return ResultUtil.tokenErr();
            }
//            Integer uid = 201;
            return siteService.reservationSite(uid, reservationSite);
        } catch (Exception e) {
            e.printStackTrace();