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

liyong

6 天以前 ded338d0bafa5594b275edb81a8f69ea4446c37c

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

@@ -30,6 +30,12 @@
     */
    private String remark;


    /**
     * 工资定额
     */
    private BigDecimal salaryQuota;

    /**
     * 创建时间
     */