Merge remote-tracking branch 'origin/master'

吴羡

2 天以前 e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff

 basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListSupplierAsk.java

@@ -2,8 +2,8 @@

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import tools.jackson.databind.annotation.JsonSerialize;
import tools.jackson.databind.ser.std.ToStringSerializer;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;