Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZArea.java

@@ -23,7 +23,7 @@ public class ZArea extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private String id;
@@ -38,7 +38,7 @@ public class ZArea extends BaseEntity {
     /**
      * 是否释放
      */
-    private Long releaseIs;
+    private String releaseIs;
     /**
      * 释放人
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZAreaBo.java

@@ -1,5 +1,8 @@
 package com.ruoyi.zdsz.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
@@ -22,9 +25,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class ZAreaBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -43,7 +47,7 @@ public class ZAreaBo extends BaseEntity {
      * 是否释放
      */
     @NotNull(message = "是否释放不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long releaseIs;
+    private String releaseIs;
 
     /**
      * 释放人

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZAreaVo.java

@@ -22,7 +22,7 @@ public class ZAreaVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String id;
@@ -44,7 +44,7 @@ public class ZAreaVo implements Serializable {
      */
     @ExcelProperty(value = "是否释放", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "release_status")
-    private Long releaseIs;
+    private String releaseIs;
 
     /**
      * 释放人

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZAreaServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZAreaBo;
 import com.ruoyi.zdsz.domain.vo.ZAreaVo;
@@ -15,6 +16,7 @@ import com.ruoyi.zdsz.domain.ZArea;
 import com.ruoyi.zdsz.mapper.ZAreaMapper;
 import com.ruoyi.zdsz.service.IZAreaService;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -29,7 +31,8 @@ import java.util.Collection;
 @Service
 public class ZAreaServiceImpl implements IZAreaService {
 
-    private final ZAreaMapper baseMapper;
+    @Resource
+    private ZAreaMapper baseMapper;
 
     /**
      * 小区下拉