diff --git a/client/src/views/dtsjygl/dtsjk.vue b/client/src/views/dtsjygl/dtsjk.vue
index 4d4a2c5..ebd4495 100644
--- a/client/src/views/dtsjygl/dtsjk.vue
+++ b/client/src/views/dtsjygl/dtsjk.vue
@@ -112,8 +112,13 @@ const state = reactive({
rules: {
industryType: [{ required: true, message: '监管行业不能为空', trigger: 'blur' }],
unitName: [{ required: true, message: '生产经营单位名称不能为空', trigger: 'blur' }],
-
- uired: true, message: '属地不能为空', trigger: 'blur' }],
+ shortName: [{ required: true, message: '单位简称不能为空', trigger: 'blur' }],
+ unifiedSocialCode: [{ required: true, message: '社会统一信用代码不能为空', trigger: 'blur' }],
+ businessStatus: [{ required: true, message: '营业状态不能为空', trigger: 'blur' }],
+ orgCode: [{ required: false, message: '所属机构不能为空', trigger: 'blur' }],
+ legalRepresentative: [{ required: true, message: '法定代表人(经营者)姓名不能为空', trigger: 'blur' }],
+ contactPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
+ agency: [{ required: true, message: '属地不能为空', trigger: 'blur' }],
legalPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
legalDuty: [{ required: true, message: '法定代表人(经营者)职位不能为空', trigger: 'blur' }],
regulatedIndustry: [{ required: true, message: '国民经济行业分类不能为空', trigger: 'blur' }],
diff --git a/client/src/views/fxczfgl/zxxcxx.vue b/client/src/views/fxczfgl/zxxcxx.vue
index 81dc530..3d33bb5 100644
--- a/client/src/views/fxczfgl/zxxcxx.vue
+++ b/client/src/views/fxczfgl/zxxcxx.vue
@@ -60,6 +60,10 @@
+
+ 在线巡查
+
+
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java b/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java
index 19f799c..2814068 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java
@@ -22,7 +22,14 @@ import java.util.List;
@Table(name = "zf_zfzbgl")
@Data
public class Zfzbgl extends BaseModel {
-
+ /**
+ * ID(ULID)
+ */
+ @Id
+ @Column(name = "zfzbglid", length = 26)
+ @GeneratedValue(generator = Constants.Genernators.gen_ulid)
+ @Comment("ID(ULID)")
+ private String zfzbglid;
/**
* 所属机构ID
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java b/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java
index b9c5da5..b3f3b7e 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java
@@ -19,6 +19,7 @@ public class OnlinePatrolDto {
private String createUserName;//录入人名称
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;//录入时间
+
private String approvalStatus;//审批状态
private String approvalUserId;//审批人id
private String approvalUserName;//审批人名称
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/repository/InsEnterprseRepository.java b/server/src/main/java/com/aisino/iles/lawenforcement/repository/InsEnterprseRepository.java
index 6df963d..afb177a 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/repository/InsEnterprseRepository.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/repository/InsEnterprseRepository.java
@@ -10,5 +10,4 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface InsEnterprseRepository extends BaseRepo {
-
}
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java
index 3cf71ac..4e18982 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java
@@ -38,7 +38,6 @@ public class ZsfzglService {
}
-
public Page page(ZsfzglQuery query, RemoteUserInfo user) {
Integer _psize = Optional.ofNullable(query.pageSize()).filter(f -> f > 0).orElse(20);
Integer _page = Optional.ofNullable(query.page()).filter(f -> f > 0).map(f -> f - 1).orElse(0);