Merge remote-tracking branch 'origin/master'

tangzy

2021-11-25 a9ec32e3db22fa4f5f44fa2b68e92862c1f58a5d

 src/main/java/org/springblade/modules/permit/vo/PermitVO.java

@@ -16,10 +16,10 @@
 */
package org.springblade.modules.permit.vo;

import org.springblade.modules.permit.entity.Permit;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import io.swagger.annotations.ApiModel;
import org.springblade.modules.permit.entity.Permit;

/**
 * 视图实体类