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

buhuazhen

2026-05-27 42bf6c727927bb58d79a3d6b65d3f2b34e15aab9

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

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