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

puzhibing

2024-03-15 889749753021d76463d85450bd95e6615886956e

 cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java

@@ -481,7 +481,7 @@
                        String s1 = this.weixinSignature(map3);
                        map3.put("sign", s1);
                        System.err.println(map3);
                        map3.put("siteBookingId", attach);
                        map3.put("siteBooking", attach);
                        return ResultUtil.success(map3);
                }
                return null;