Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

2026-05-22 2d03ec79e1892248b520cf097e8a58dd82a4892f

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

@@ -55,11 +55,15 @@
    @Excel(name = "备注")
    private String remark;

    @ApiModelProperty(value ="报工人ids")
    @TableField(value = "user_ids")
    @Excel(name = "报工人ids")
    private String userIds;

    /**
     * 工资定额
     */
    @Excel(name = "工资定额")
    @Excel(name = "工资定额"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                )
//    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private BigDecimal salaryQuota;