Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2022-12-27 c899166d7986bbc5a8db58381e75f27ea2aeac1e

 ycl-platform/src/main/java/com/ycl/common/util/DateUtil.java

File was renamed from ycl-platform/src/main/java/com/ycl/controller/video/common/util/DateUtil.java
@@ -1,4 +1,4 @@
package com.ycl.controller.video.common.util;
package com.ycl.common.util;

import java.text.ParseException;
import java.text.SimpleDateFormat;