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

jiaosong

2023-09-11 47f9dffa729e76ae5d0f2f845f55d8cc7179e8ac

 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;