Merge remote-tracking branch 'origin/master'

zhangherong

2025-05-06 0af9edae246c6aed95e7836f31b5ee4ef0527649

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java

@@ -24,7 +24,7 @@
    @TableField(value = "device_no")
    private String deviceNo;
    @TableField(value = "depart_id")
    @Dict(dictTable = "sys_department",dicCode = "depart_id",dicText = "depart_name")
    @Dict(dictTable = "mdc_production",dicCode = "id",dicText = "production_name")
    private String departId;
    @TableField(value = "control_system")
    private String controlSystem;