Merge remote-tracking branch 'origin/master'

Fancy

2024-09-14 c3ef548aa36678645b3860c0cf9a0283a97efb92

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrderItem.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotBlank;
@@ -36,6 +37,9 @@
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long proId;

    @TableField(exist = false)
    public String name;

    /**
    * 生产数量
    */
@@ -48,4 +52,7 @@
    @JSONField(serialize = false)
    public Boolean deleted;

    @TableField(exist = false)
    public String completeRate;

}