Merge remote-tracking branch 'origin/master' into master

zengh

2021-01-28 d80ca95c3c0cf4b1a14f335feb13cdf30820839c

 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;


/**