Merge remote-tracking branch 'origin/master'

zss

2023-08-23 35bf80accf4117e3de030fdd7e3962f16a5fcfd9

 user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java

@@ -8,7 +8,6 @@
import java.util.Map;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.sun.jmx.snmp.Timestamp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;