Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

maven

2025-08-27 4275b293cfc7779a20ccea30b2f773aff0fe06db

 basic-server/src/main/java/com/ruoyi/basic/dto/CoalFieldDto.java

@@ -6,15 +6,5 @@
@Data
public class CoalFieldDto extends CoalField {

    private String fieldName;

    public CoalFieldDto(String name) {
        this.fieldName = name;
    }

    public static CoalFieldDto from(String name) {
        return new CoalFieldDto(name);
    }

    private String searchAll;
}