Merge remote-tracking branch 'origin/master'

zhangherong

2025-06-24 bbfb4d9d66d230e4ae55d51bf2df1a747dc1a25a

 src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -184,8 +184,8 @@
    /**
     * 负责产线
     */
    @Excel(name="负责产线",width = 15,dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
    @Dict(dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
    @Excel(name="负责产线",width = 15,dictTable ="base_factory",dicText = "factory_name",dicCode = "id")
    @Dict(dictTable ="base_factory",dicText = "factory_name",dicCode = "id")
    private String productionIds;

    /**