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

jiaosong

2023-09-21 2193f1e8240e2a0ed5900dddc6347a1d9db081cf

 server/service/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -284,7 +284,7 @@
     * @return String
     * @throws Exception
     */
    public static String getNowShortDate() throws Exception {
    public static String getNowShortDate() {
        String nowDate = "";
        try {
            java.sql.Date date = null;