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

zss

4 天以前 17d65c77c6fedf1b51afec166c5a9735c6e4d38e

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

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

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

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