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

maven

11 小时以前 77ef6f1f147d606eba70a567db6ec7799da5de4d

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

 src/main/java/com/ruoyi/common/enums/StockQualifiedRecordTypeEnum.java

@@ -13,7 +13,7 @@
    PURCHASE_STOCK_IN("7", "采购-入库"),
    SALE_STOCK_OUT("8", "销售-出库"),
    QUALITYINSPECT_STOCK_IN("11", "质检-合格入库"),
    SALE_SHIP_STOCK_OUT("11", "销售-发货出库");
    SALE_SHIP_STOCK_OUT("13", "销售-发货出库");

    private final String code;
    private final String value;