Merge remote-tracking branch 'origin/master'

zengh

2021-03-18 d5a8a64768db15ff6917e150358a954582e384fd

 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;