Merge branch 'dev_New_kthg' of http://114.132.189.42:9002/r/product-invento...

chenhj

4 小时以前 455b965c6435b5359bb5c25f2b6810dbc06f5481

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

@@ -46,7 +46,7 @@
    /**
     * 工资定额
     */
    @Excel(name = "工资定额")
//    @Excel(name = "工资定额")
    private BigDecimal salaryQuota;

    /**