Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

zss

11 小时以前 f68d79d0ff6658795c19c2fd473fab9ff6f0640d

 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;

    /**
     * 创建时间
     */