Merge remote-tracking branch 'origin/dev_New' into dev_New

buhuazhen

5 天以前 3138e373e0c9c7eb5e0b0847ef16a7753c4fc170

 src/main/java/com/ruoyi/sales/pojo/SalesLedger.java

@@ -143,5 +143,9 @@
    @TableField(exist = false)
    //是否发货(台账页面颜色控制)
    private Boolean isFh;

    @TableField(exist = false)
    //是否可编辑
    private Boolean isEdit;
}