chore: 合并失败

gongchunyi

4 天以前 b4c3f13af821d10a0ada7164bda95f23bac206e5

 src/main/java/com/ruoyi/production/pojo/SalesLedgerScheduling.java

@@ -44,6 +44,11 @@
    private String speculativeTradingName;

    /**
     * 产线
     */
    private String productionLine;

    /**
     * 派工人名称
     */
    private String schedulingUserName;