Merge remote-tracking branch 'origin/master'

zhangherong

2025-05-23 50ecf03ea7c6185123e36d02a106b447d48a3509

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

@@ -70,6 +70,9 @@
    @TableLogic
    @TableField(value = "delete_flag", select = false)
    private Integer deleteFlag = 0;
    //被借用id
    @TableField(value = "borrow_id")
    private String borrowId;

    //创建人
    private transient String createName;