Merge remote-tracking branch 'origin/master'

tangzy

2021-03-20 e0d1a9a05fee8ef75ce8f5bd7107be32ec8c8e82

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/entity/Jingdan.java

@@ -23,6 +23,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;