Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-04 c5cb162b5cbdb589e97290fba3ac3e9241ec48d4

 cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java

@@ -277,11 +277,7 @@
        return ResultUtil.success();
    }

    public static void main(String[] args) {
        String a ="2023-07-28 10:30-15:30";
        String substring = a.substring(0,a.lastIndexOf("-"));
        System.out.println(substring);
    }

    /**
     * 课程微信支付
     * @param paymentPrice