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

zss

3 天以前 7a9bd9b7da7c4943e8b5853d4d7de5cba72f3de0

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

@@ -1,6 +1,7 @@
package com.ruoyi.production.pojo;

import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;

@@ -67,6 +68,12 @@
     * 工序
     */
    private String process;


    /**
     * 产线
     */
    private String productionLine;
    /**
     * 排产日期
     */