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

buhuazhen

2 天以前 392366ea36a839e5d0ea05968e6da31cd53a9ee6

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

@@ -37,4 +37,5 @@
     */
    @TableField(value = "field_description")
    private String fieldDescription;

}