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

maven

7 天以前 539624ef39177ebb6fd5577b83df7097dd6f4bec

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

@@ -47,8 +47,12 @@
     * 工资定额
     */
    @Excel(name = "工资定额")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private BigDecimal salaryQuota;

    @ApiModelProperty("类型 区分是计时还是计件 0 计时 1计件")
    private Long type;

    /**
     * 创建时间
     */