Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-03-22 81df1dcdb77b01b4a957b2b0725f3a91cfc0f72a

 north-glass-erp/src/main/java/com/example/erp/entity/pp/BasicDataProduce.java

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.example.erp.entity.sd.BasicData;
import lombok.Data;

import java.time.LocalDate;
@@ -15,4 +16,6 @@
    private String basicCategory;
    private LocalDate createTime;
    private LocalDate updateTime;
    private BasicData basicData;

}