Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-16 a0dc6d318064e45557bf2426a8f3064dbd23d93e

 src/main/java/com/zy/asrs/entity/BasCrnStatus.java

@@ -9,7 +9,6 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;