Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

Junjie

2024-03-28 c4b00b0268f35a7a9e016e818b0f6e27bc3876f0

 zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java

@@ -406,6 +406,12 @@

            }

            if (column.getName().equals("deleted")) {
                entityIm.append("import com.baomidou.mybatisplus.annotation.TableLogic;\n");
                sb.append("    ")
                        .append("@TableLogic\n");
            }

            if ("Date".equals(column.getType())){
                if (setDateTimeFormat){
                    entityIm.append("import org.springframework.format.annotation.DateTimeFormat;").append("\n");