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

liding

6 天以前 db85e062349683b3131726fe90dcc99d4aff35ba

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

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


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

    /**
     * 创建时间
     */