Merge remote-tracking branch 'origin/master'

zengh

2021-03-12 70f01fd17bb642c2f773d5c5567018d7573a2dde

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/dto/healthcodeDTO.java

@@ -19,7 +19,6 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.jfpt.healthcode.entity.healthcode;
import org.springblade.jfpt.lx.entity.Lx;


/**