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

liyong

2026-05-21 8e89f95b9db4039f0cb8b4b8dc7974c247366c4c

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

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