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

maven

2025-08-26 d346846239a8a39246c464dc634f5fd72add99ab

 basic-server/src/main/java/com/ruoyi/basic/entity/CoalField.java

@@ -33,13 +33,9 @@
    private String fieldName;

    /**
     * 字段名数字
     */
    @TableField(value = "field_name")
    private String fieldNumber;
    /**
     * 字段描述
     */
    @TableField(value = "field_description")
    private String fieldDescription;

}