Merge remote-tracking branch 'origin/master'

zhangherong

2025-07-12 6e006cb835fce4720139de0cc2ec3be734295ed9

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java

@@ -120,7 +120,7 @@
     */
    @Excel(name = "中心/工区/工段", width = 15, orderNum = "4")
    @ApiModelProperty(value = "中心/工区/工段")
    @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "factory_code")
    @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
    private String factoryOrgCode;

    /**