diff --git a/yxt_supervise/pom.xml b/yxt_supervise/pom.xml
index 9c4d4b31..806bbe01 100644
--- a/yxt_supervise/pom.xml
+++ b/yxt_supervise/pom.xml
@@ -14,6 +14,7 @@
supervise-portal
supervise-supplychain
supervise-system
+ yxt_adapter
pom
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonDetailsVo.java
index ed56e422..93def413 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonDetailsVo.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonDetailsVo.java
@@ -27,7 +27,6 @@ package com.yxt.supervise.portal.api.dictcommon;
import com.yxt.common.core.vo.Vo;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonDto.java
index 485499ea..9e13111c 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonDto.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonDto.java
@@ -27,7 +27,6 @@ package com.yxt.supervise.portal.api.dictcommon;
import com.yxt.common.core.dto.Dto;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonFeign.java
index 094d5c0f..7e2992ab 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonFeign.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonFeign.java
@@ -25,16 +25,14 @@
*********************************************************/
package com.yxt.supervise.portal.api.dictcommon;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-
/**
* Project: yxt_supervise(宇信通监管)
* File: DictCommonFeign.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonFeignFallback.java
index 59a4aed6..1ba978b4 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonFeignFallback.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonFeignFallback.java
@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
-import java.util.List;
-
/**
* Project: yxt_supervise(宇信通监管)
* File: DictCommonFeignFallback.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonQuery.java
index 5d435885..3e8cfddd 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonQuery.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonQuery.java
@@ -27,7 +27,6 @@ package com.yxt.supervise.portal.api.dictcommon;
import com.yxt.common.core.query.Query;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonVo.java
index 4d1f0ead..c54f6278 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonVo.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonVo.java
@@ -27,7 +27,6 @@ package com.yxt.supervise.portal.api.dictcommon;
import com.yxt.common.core.vo.Vo;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeDetailsVo.java
index 38ac4257..cb16cd6d 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeDetailsVo.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeDetailsVo.java
@@ -27,7 +27,6 @@ package com.yxt.supervise.portal.api.dicttype;
import com.yxt.common.core.vo.Vo;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeDto.java
index 41e7fad8..92e607a2 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeDto.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeDto.java
@@ -27,7 +27,6 @@ package com.yxt.supervise.portal.api.dicttype;
import com.yxt.common.core.dto.Dto;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeFeign.java
index 5422b7eb..9c5c7920 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeFeign.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeFeign.java
@@ -25,16 +25,14 @@
*********************************************************/
package com.yxt.supervise.portal.api.dicttype;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-
/**
* Project: yxt_supervise(宇信通监管)
* File: DictTypeFeign.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeFeignFallback.java
index b2260392..c3653fde 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeFeignFallback.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeFeignFallback.java
@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
-import java.util.List;
-
/**
* Project: yxt_supervise(宇信通监管)
* File: DictTypeFeignFallback.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeQuery.java
index ee3796ea..96fd6b26 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeQuery.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeQuery.java
@@ -27,7 +27,6 @@ package com.yxt.supervise.portal.api.dicttype;
import com.yxt.common.core.query.Query;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dictcommon/DictCommonRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dictcommon/DictCommonRest.java
index ca7dc3a8..2cb04a4a 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dictcommon/DictCommonRest.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dictcommon/DictCommonRest.java
@@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.supervise.portal.biz.dictcommon;
+
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -34,8 +35,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-
/**
* Project: yxt_supervise(宇信通监管)
* File: DictCommonFeignFallback.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dictcommon/DictCommonService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dictcommon/DictCommonService.java
index 99bb5bb8..7738870a 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dictcommon/DictCommonService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dictcommon/DictCommonService.java
@@ -28,18 +28,14 @@ package com.yxt.supervise.portal.biz.dictcommon;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.supervise.portal.api.dictcommon.*;
-import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
-
+import com.yxt.supervise.portal.api.dictcommon.*;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
-import java.util.List;
-
/**
* Project: yxt_supervise(宇信通监管)
* File: DictCommonService.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dicttype/DictTypeMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dicttype/DictTypeMapper.java
index 3263f1f6..6c09848c 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dicttype/DictTypeMapper.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dicttype/DictTypeMapper.java
@@ -26,8 +26,8 @@
package com.yxt.supervise.portal.biz.dicttype;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.supervise.portal.api.dicttype.DictType;
import com.yxt.supervise.portal.api.dicttype.DictTypeVo;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dicttype/DictTypeRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dicttype/DictTypeRest.java
index 987a7bf0..c92f8fe2 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dicttype/DictTypeRest.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dicttype/DictTypeRest.java
@@ -34,8 +34,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-
/**
* Project: yxt_supervise(宇信通监管)
* File: DictTypeFeignFallback.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dicttype/DictTypeService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dicttype/DictTypeService.java
index 6d112596..21ce65c3 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dicttype/DictTypeService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dicttype/DictTypeService.java
@@ -28,18 +28,14 @@ package com.yxt.supervise.portal.biz.dicttype;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.supervise.portal.api.dicttype.*;
-import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
-
+import com.yxt.supervise.portal.api.dicttype.*;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
-import java.util.List;
-
/**
* Project: yxt_supervise(宇信通监管)
* File: DictTypeService.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java
index 6956ef94..94530148 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java
@@ -32,12 +32,12 @@ public interface PurchaseRequisitionMapper extends BaseMapper selectAll();
@Select(" SELECT MAX(sbi.codeUnified) codeUnified, MAX(sbi.name) name ,1,convert(SUM(packageTotalPrice),decimal(12,2)) billTotalPrice, " +
- "(SELECT convert(SUM(colq16),decimal(12,2)) FROM gd_instorage gic WHERE gic.colex=pr.supplierOnlyCode " +
- "and gic.colh7 in(select prodcode from gd_rescategory_prod) ) prodValue," +
- "MAX(pr.`arrivalDate`) arrivalDate " +
- "FROM `supplier_bank_info` sbi " +
- "LEFT JOIN `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified" +
- "LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid " +
+ " (SELECT convert(SUM(colq16),decimal(12,2)) FROM gd_instorage gic WHERE gic.colex=pr.supplierOnlyCode " +
+ " and gic.colh7 in(select prodcode from gd_rescategory_prod) ) prodValue," +
+ " MAX(pr.`arrivalDate`) arrivalDate " +
+ " FROM `supplier_bank_info` sbi " +
+ " LEFT JOIN `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified " +
+ " LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid " +
" WHERE pr.purchaseState=1 AND pr.bankState=1 AND sbi.`purchaseRequisition`=1 AND sbi.`bankState`=1 " +
" GROUP BY pr.supplierOnlyCode ORDER BY sbi.name;")
List> ztspglhzb();
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java
index 08a07f58..530f60ed 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java
@@ -32,10 +32,8 @@ import cn.hutool.core.text.csv.CsvUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.sax.handler.RowHandler;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetails;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.core.result.FileUploadResult;
import com.yxt.supervise.portal.api.brandinfo.BrandInfo;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoMapper.java
index dc59b947..3a8b95eb 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoMapper.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoMapper.java
@@ -66,7 +66,7 @@ public interface SupplierInfoMapper extends BaseMapper {
List selectAdoptedListVo();
@Select("select supplierName name from purchase_requisition group by supplierName")
List selectPurSupplier();
- @Select("select * from supplier_bank_info where code=#{code}")
+ @Select("select * from supplier_bank_info where codeunified=#{code}")
SupplierInfoVo selectByCode(String code);
@Select("select * from supplier_index where code=#{code}")
SupplierInfoVo selectByCodeForIndex(@Param("code") String supplierCode);
diff --git a/yxt_supervise/supervise-system/pom.xml b/yxt_supervise/supervise-system/pom.xml
index f8fe4bfb..b9c62e0c 100644
--- a/yxt_supervise/supervise-system/pom.xml
+++ b/yxt_supervise/supervise-system/pom.xml
@@ -2,23 +2,17 @@
-
- yxt_supervise
- com.yxt.supervise
- 0.0.1
-
- 4.0.0
+
+ 4.0.0
supervise-system
- pom
supervise-system-api
supervise-system-biz
+ com.yxt.supervise
+ 0.0.1
-
- 15
- 15
-
+ pom
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-api/pom.xml b/yxt_supervise/supervise-system/supervise-system-api/pom.xml
index a4e5848b..5fd1f243 100644
--- a/yxt_supervise/supervise-system/supervise-system-api/pom.xml
+++ b/yxt_supervise/supervise-system/supervise-system-api/pom.xml
@@ -3,17 +3,54 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- supervise-system
- com.yxt.supervise
+ com.yxt
+ yxt-parent
0.0.1
+
4.0.0
-
supervise-system-api
+ com.yxt.supervise
+ 0.0.1-SNAPSHOT
+
+
+
+ com.yxt
+ yxt-common-core
+ 0.0.1
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-openfeign
+
+
+
+ org.projectlombok
+ lombok
+ 1.18.24
+ true
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+
+
+ com.baomidou
+ mybatis-plus-annotation
+
+
+
+
+
+ nexus-releases
+ http://172.18.0.3:8081/repository/yxt-mvn-releases/
+
+
+ nexus-snapshots
+ http://172.18.0.3:8081/repository/yxt-mvn-snapshot/
+
+
-
- 15
- 15
-
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/config/DictCommonType.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/config/DictCommonType.java
new file mode 100644
index 00000000..f823ab43
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/config/DictCommonType.java
@@ -0,0 +1,267 @@
+package com.yxt.supervise.system.config;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/1 10:23
+ * @description 常量值管理
+ */
+public class DictCommonType {
+
+ //客户端获取手机验证码redis前缀定义
+ public static final String WX_REGIST = "wx-regist-";//注册获取验证码
+ public static final String WX_LOGIN = "wx-login-";//登录获取验证码
+ public static final String WX_FORGET = "wx-forget-";//忘记密码获取验证码
+ public static final String WX_UPDATE = "wx-update-";//忘记密码获取验证码
+ public static final String WX_NEW = "wx-new-";//新手机号获取验证码
+
+ /*供应厂商相关*/
+ @ApiModelProperty(value = "供应商分类")
+ public static final String SUPPLIER_TYPE = "supplierType";//数据字典已添加
+ @ApiModelProperty(value = "供应类别")
+ public static final String SUPPLY_TYPE = "supplyType";//数据字典已添加
+ @ApiModelProperty(value = "供应商分组")
+ public static final String SUPPLIE_RGROUP = "supplierGroup";//数据字典已添加
+
+ /*供应厂商财务信息相关*/
+ @ApiModelProperty(value = "结算币种")
+ public static final String SETTLEMENT_CURRENCY = "settlementCurrency";//数据字典已添加
+ @ApiModelProperty(value = "结算方式")
+ public static final String SETTLEMENT_WAY = "settlementWay";//数据字典已添加
+ @ApiModelProperty(value = "税分类")
+ public static final String TAX_CLASSIFICATION = "taxClassification";//数据字典已添加
+ /*基础信息品牌相关*/
+ @ApiModelProperty(value = "品牌类型")
+ public static final String BRAND_TYPE = "brandType";//数据字典已添加
+ @ApiModelProperty(value = "职级（岗位）")
+ public static final String POSTLEVEL = "postLevel";
+
+ /*车型、车型配置、车辆信息相关*/
+ @ApiModelProperty(value = "车辆类型")
+ public static final String VEHICLE_TYPE = "vehicleType";//数据字典已添加
+ @ApiModelProperty(value = "排放标准")
+ public static final String EMISSION_STANDARD = "emissionStandard";//数据字典已添加
+ @ApiModelProperty(value = "产品线")
+ public static final String PRODUCT_LINE = "productLine";//数据字典已添加
+ @ApiModelProperty(value = "后桥")
+ public static final String REAR_AXLE = "rearAxle";//数据字典已添加
+ @ApiModelProperty(value = "速比")
+ public static final String SPEED_RATIO = "speedRatio";//数据字典已添加
+ @ApiModelProperty(value = "系别")
+ private static final String SERIES = "series";//数据字典已添加
+ @ApiModelProperty(value = "车辆功能")
+ private static final String VEHICLE_FUNCTION = "vehicleFunction";//数据字典已添加
+ @ApiModelProperty(value = "细分市场")
+ private static final String MARKETSEGMENTS = "marketSegments";//数据字典已添加
+
+ @ApiModelProperty(value = "车身颜色")
+ public static final String BODYCOLOR = "bodyColor";
+ @ApiModelProperty(value = "缓速器")
+ public static final String SLOWMACHINE = "slowMachine";
+ @ApiModelProperty(value = "后视镜")
+ public static final String REARVIEWMIRROR = "rearViewMirror";
+ @ApiModelProperty(value = "轮胎")
+ public static final String TIRESIZE = "tireSize";
+ @ApiModelProperty(value = "驾驶室")
+ public static final String SPECIFICATION = "specification";
+ @ApiModelProperty(value = "后桥速比")
+ public static final String REARAXLERATIO = "rearAxleRatio";
+ @ApiModelProperty(value = "轮毂材质")
+ public static final String HUBMATERIAL = "hubMaterial";
+ @ApiModelProperty(value = "悬架")
+ public static final String SUSPENSION = "suspension";
+ @ApiModelProperty(value = "座椅")
+ public static final String SEAT = "seat";
+ @ApiModelProperty(value = "鞍座")
+ public static final String SADDLE = "saddle";
+ @ApiModelProperty(value = "轴距")
+ public static final String WHEELBASE = "wheelbase";
+ @ApiModelProperty(value = "保险杠")
+ public static final String BUMPER = "bumper";
+ @ApiModelProperty(value = "配置包")
+ public static final String CONFIGURINGBAO = "configuringBao";
+ @ApiModelProperty(value = "独立热源")
+ public static final String INDEPENDENTSOURCES = "independentSources";
+ @ApiModelProperty(value = "燃料箱")
+ public static final String FUELTANK = "fuelTank";
+ @ApiModelProperty(value = "有无:1有0无")
+ public static final String WHETHER = "whether";
+
+ @ApiModelProperty(value = "车辆状态")
+ public static final String VEHICLE_STATE = "vehicleState";
+ @ApiModelProperty(value = "车辆状态（车辆台账）")
+ public static final String VEHICLE_LEDGER_STATE = "vehicleLedgerState";
+ @ApiModelProperty(value = "驱动")
+ public static final String DRIVER = "driver";
+ @ApiModelProperty(value = "马力")
+ public static final String HORSEPOWER = "horsepower";
+ @ApiModelProperty(value = "锁定状态")
+ public static final String LOCKED_STATE = "lockedState";
+ @ApiModelProperty(value = "预计订金日期")
+ public static final String RESERVE_DEPOSIT_DATE = "reserveDepositDate";
+
+
+ @ApiModelProperty(value = "贷款主体类型")
+ public static final String LOANTYPE = "loanType";
+ @ApiModelProperty(value = "打包项目")
+ public static final String PACKAGINGPROJECT = "packagingProject";
+ @ApiModelProperty(value = "融资项目（比打包项目多一个“配件”）")
+ public static final String PACKAGINGPROJECTFIN = "packagingProjectFin";
+ @ApiModelProperty(value = "变速箱")
+ public static final String GEARBOX = "gearbox";
+ @ApiModelProperty(value = "燃料种类")
+ public static final String FUELTYPE = "fuelType";
+ @ApiModelProperty(value = "版本(车辆需求)")
+ public static final String VEHICLEVERSION = "vehicleVersion";
+ @ApiModelProperty(value = "采购形式")
+ public static final String PURCHASINGFORM = "purchasingForm";
+ /*经销商相关*/
+ @ApiModelProperty(value = "经销商分类")
+ public static final String DISTRIBUTOR_CLASSIFICATION = "distributorClassification";//数据字典已添加
+ @ApiModelProperty(value = "经销商类型")
+ public static final String DISTRIBUTOR_TYPE = "distributorType";//数据字典已添加
+ @ApiModelProperty(value = "经销商等级")
+ public static final String DISTRIBUTOR_LEVEL = "distributorLevel";//数据字典已添加
+ @ApiModelProperty(value = "企业性质")
+ public static final String ENTERPRISE_NATURE = "enterpriseNature";//数据字典已添加
+ @ApiModelProperty(value = "登记状态")
+ public static final String REGIST_STATE = "registState";
+ @ApiModelProperty(value = "注册资本单位")
+ public static final String REGISTEREDCAPITAL_ORG = "registeredCapitalOrg";
+ @ApiModelProperty(value = "项目类型")
+ public static final String PROJECT_TYPE = "projectType";
+ /*经销商相关结束*/
+
+
+ @ApiModelProperty(value = "合格证情况：0001虚拟 ，002正式")
+ public static final String CERTIFICATE_SITUATION = "certificateSituation";
+ @ApiModelProperty(value = "客户类型：1个人2企业")
+ public static final String CUSTOMER_TYPE = "customerType";
+ @ApiModelProperty(value = "登记注册号类型")
+ public static final String REGIST_NUM_TYPE = "registNumType";
+ @ApiModelProperty(value = "现居住状况")
+ public static final String CURRENT_LIVE_STATE = "currentlivestate";
+ @ApiModelProperty(value = "教育程度")
+ public static final String EDUCATION_DEGREE = "educationdegree";
+ @ApiModelProperty(value = "雇员类型")
+ public static final String EMPLOYEE_TYPE = "employeetype";
+ @ApiModelProperty(value = "证件类型")
+ public static final String DOCUMENT_TYPE = "documenttype";
+ @ApiModelProperty(value = "行业类别")
+ public static final String INDUSTRY_TYPE = "industrytype";
+ @ApiModelProperty(value = "经济类型")
+ public static final String ECONOMIC_TYPE = "economictype";
+ @ApiModelProperty(value = "组织机构类别")
+ public static final String ORGANIZATION_TYPE = "organizationtype";
+ @ApiModelProperty(value = "组织机构类别细分")
+ public static final String ORGANIZATION_TYPE_DETAILS = "organizationtypedetails";
+
+ @ApiModelProperty(value = "是或否")
+ public static final String IS_TRUE = "isTrue";
+ @ApiModelProperty(value = "准驾车型")
+ public static final String CAR_TYPE = "carType";
+
+ @ApiModelProperty(value = "与客户关系")
+ public static final String RELATION_SHIP = "relationship";
+ @ApiModelProperty(value = "现工作单位性质")
+ public static final String ORG_NATURE = "orgNature";
+ @ApiModelProperty(value = "主要收入来源")
+ public static final String INCOME_SOURCE = "incomeSource";
+ @ApiModelProperty(value = "职位")
+ public static final String POSITION = "position";
+ @ApiModelProperty(value = "经销商类型")
+ public static final String DEALERS_TYPE = "dealersType";
+ @ApiModelProperty(value = "附件类型")
+ public static final String ATTACH_TYPE = "attachType";
+ @ApiModelProperty(value = "信用记录")
+ public static final String CREDIT_RECORD = "creditRecord";
+ @ApiModelProperty(value = "拟租赁形式l")
+ public static final String PLANS_TO_LEASE = "plansToLease";
+ @ApiModelProperty(value = "去返程货物")
+ public static final String GO_GOODS = "goGoods";
+ @ApiModelProperty(value = "经营业务范围")
+ public static final String BUSINESSSCOPE = "businessScope";
+ /* 客户信息相关*/
+ @ApiModelProperty(value = "客户分类")
+ public static final String CUSTOMER_CLASS = "customerClass";
+ @ApiModelProperty(value = "客户来源")
+ public static final String CUSTOMER_SOURCE = "customerSource";
+ @ApiModelProperty(value = "客户等级")
+ public static final String CUSTOMER_LEVEL = "customerLevel";
+ @ApiModelProperty(value = "来访方式")
+ public static final String VISIT_WAY = "visitWay";
+ @ApiModelProperty(value = "跟进状态")
+ public static final String FOLLOW_STATE = "followState";
+ @ApiModelProperty(value = "提醒日期（天）")
+ public static final String REMIND_DAY = "remindDay";
+ @ApiModelProperty(value = "承运货物类型")
+ public static final String CONSIGNMENT_TYPE = "consignmentType";
+ @ApiModelProperty(value = "承运货物（暂为假数据）")
+ public static final String CONSIGNMENT = "consignment";
+ @ApiModelProperty(value = "购车方式")
+ public static final String PURCHASETYPE = "purchaseType";
+ @ApiModelProperty(value = "提车方式")
+ public static final String SALETYPE = "saleType";
+ /* 车辆订单 */
+ @ApiModelProperty(value = "单据类型")
+ public static final String BILLSTYPE = "billsType";
+ @ApiModelProperty(value = "合同类型")
+ public static final String CONTRACTTYPE = "contractType";
+
+ @ApiModelProperty(value = "主车优惠类型")
+ public static final String DISCOUNTTYPE = "discountType";
+ @ApiModelProperty(value = "还款方式")
+ public static final String MODEOFREPAY = "modeOfRePay";
+ @ApiModelProperty(value = "保证金方式")
+ public static final String BONDMETHOD = "bondMethod";
+ @ApiModelProperty(value = "业务类型")
+ public static final String BUSINESSTYPE = "businessType";
+ @ApiModelProperty(value = "开户银行")
+ public static final String BANK = "bank";
+ @ApiModelProperty(value = "账户类型")
+ public static final String ACCOUNTTYPE = "accountType";
+ @ApiModelProperty(value = "运输货物")
+ public static final String TRANSPORTCARGO = "transportCargo";
+ @ApiModelProperty(value = "结账周期")
+ public static final String CHECKOUTCYCLE = "checkoutCycle";
+ @ApiModelProperty(value = "虚拟订单类型")
+ public static final String DEPOSITBILLTYPE = "depositBillType";
+ @ApiModelProperty(value = "付款方式")
+ public static final String PAYMENTTYPE = "paymentType";
+
+ /* 物料相关 */
+ @ApiModelProperty(value = "物料分组")
+ public static final String MATERIAL_GROUP = "materialGroup";
+ @ApiModelProperty(value = "物料属性")
+ public static final String MATERIAL_PROPERTIES = "materialProperties";
+ @ApiModelProperty(value = "存货类别")
+ public static final String STOCK_TYPE = "stockType";
+ @ApiModelProperty(value = "基本单位")
+ public static final String BASIC_UNIT = "basicUnit";
+
+ /* 合同相关 */
+ @ApiModelProperty(value = "人员类型")
+ public static final String PERSONNEL_TYPE = "personnelType";
+
+ /* 开票申请单相关 */
+ @ApiModelProperty(value = "开票性质")
+ public static final String INVOICING_NATURE = "invoicingNature";
+
+ /*员工信息管理相关*/
+ @ApiModelProperty(value = "婚姻状况")
+ public static final String MARITAL_STATUS = "maritalstatus";
+ @ApiModelProperty(value = "民族")
+ public static final String NATIONAL = "national";
+ @ApiModelProperty(value = "性别")
+ public static final String SEX = "sex";
+ @ApiModelProperty(value = "政治面貌")
+ public static final String POLITICAL = "political";
+
+
+ /*资料清单相关*/
+ @ApiModelProperty(value = "资料类别")
+ public static final String DATA_TYPE = "dataType";
+ @ApiModelProperty(value = "文件格式")
+ public static final String FILE_TYPE = "fileType";
+}
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonDetailsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonDetailsVo.java
new file mode 100644
index 00000000..21c94ca9
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonDetailsVo.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dictcommon;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonVo.java
+ * Class: com.supervise.api.dictcommon.DictCommonVo
+ * Description: 数据字典——数据项 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项 视图数据详情", description = "数据字典——数据项 视图数据详情")
+public class DictCommonDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("类型code")
+ private String dictType; // 类型code
+ @ApiModelProperty("key值")
+ private String dictKey; // key值
+ @ApiModelProperty("value值")
+ private String dictValue; // value值
+ @ApiModelProperty("路径")
+ private String sidPath; // 路径
+ @ApiModelProperty("父级sid")
+ private String parentSid; // 父级sid
+ @ApiModelProperty("分组名称")
+ private String groupName; // 分组名称
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonDto.java
new file mode 100644
index 00000000..6281a5cf
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonDto.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dictcommon;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonDto.java
+ * Class: com.supervise.api.dictcommon.DictCommonDto
+ * Description: 数据字典——数据项 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项 数据传输对象", description = "数据字典——数据项 数据传输对象")
+public class DictCommonDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("类型code")
+ private String dictType; // 类型code
+ @ApiModelProperty("key值")
+ private String dictKey; // key值
+ @ApiModelProperty("value值")
+ private String dictValue; // value值
+ @ApiModelProperty("路径")
+ private String sidPath; // 路径
+ @ApiModelProperty("父级sid")
+ private String parentSid; // 父级sid
+ @ApiModelProperty("分组名称")
+ private String groupName; // 分组名称
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeign.java
new file mode 100644
index 00000000..22933a66
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeign.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dictcommon;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonFeign.java
+ * Class: com.supervise.api.dictcommon.DictCommonFeign
+ * Description: 数据字典——数据项.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "数据字典——数据项")
+@FeignClient(
+ contextId = "yxt-supervise-DictCommon",
+ name = "yxt-supervise",
+ path = "v1/dictcommon",
+ fallback = DictCommonFeignFallback.class)
+public interface DictCommonFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody DictCommonDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeignFallback.java
new file mode 100644
index 00000000..27c33c1e
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeignFallback.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dictcommon;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonFeignFallback.java
+ * Class: com.supervise.api.dictcommon.DictCommonFeignFallback
+ * Description: 数据字典——数据项.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class DictCommonFeignFallback implements DictCommonFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt_supervise/dictcommon/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(DictCommonDto dto){
+ return ResultBean.fireFail().setMsg("接口yxt_supervise/dictcommon/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口yxt_supervise/dictcommon/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt_supervise/dictcommon/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonQuery.java
new file mode 100644
index 00000000..fcf083a6
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonQuery.java
@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dictcommon;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonQuery.java
+ * Class: com.supervise.api.dictcommon.DictCommonQuery
+ * Description: 数据字典——数据项 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项 查询条件", description = "数据字典——数据项 查询条件")
+public class DictCommonQuery implements Query {
+
+ @ApiModelProperty("类型code")
+ private String dictType; // 类型code
+ @ApiModelProperty("key值")
+ private String dictKey; // key值
+ @ApiModelProperty("value值")
+ private String dictValue; // value值
+ @ApiModelProperty("路径")
+ private String sidPath; // 路径
+ @ApiModelProperty("父级sid")
+ private String parentSid; // 父级sid
+ @ApiModelProperty("分组名称")
+ private String groupName; // 分组名称
+
+}
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonVo.java
new file mode 100644
index 00000000..68e5856d
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonVo.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dictcommon;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonVo.java
+ * Class: com.supervise.api.dictcommon.DictCommonVo
+ * Description: 数据字典——数据项 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项 视图数据对象", description = "数据字典——数据项 视图数据对象")
+public class DictCommonVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("类型code")
+ private String dictType; // 类型code
+ @ApiModelProperty("key值")
+ private String dictKey; // key值
+ @ApiModelProperty("value值")
+ private String dictValue; // value值
+ @ApiModelProperty("路径")
+ private String sidPath; // 路径
+ @ApiModelProperty("父级sid")
+ private String parentSid; // 父级sid
+ @ApiModelProperty("分组名称")
+ private String groupName; // 分组名称
+
+}
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictType.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictType.java
new file mode 100644
index 00000000..b9e0bfdf
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictType.java
@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dicttype;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictType.java
+ * Class: com.supervise.api.dicttype.DictType
+ * Description: 数据字典——数据类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型", description = "数据字典——数据类型")
+@TableName("dict_type")
+public class DictType extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("类型代码")
+ private String dictTypeCode; // 类型代码
+ @ApiModelProperty("类型名称")
+ private String dictTypeName; // 类型名称
+ @ApiModelProperty("级别")
+ private String dictTypeLevel; // 级别
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeDetailsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeDetailsVo.java
new file mode 100644
index 00000000..e19e62aa
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeDetailsVo.java
@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dicttype;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeVo.java
+ * Class: com.supervise.api.dicttype.DictTypeVo
+ * Description: 数据字典——数据类型 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型 视图数据详情", description = "数据字典——数据类型 视图数据详情")
+public class DictTypeDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("类型代码")
+ private String dictTypeCode; // 类型代码
+ @ApiModelProperty("类型名称")
+ private String dictTypeName; // 类型名称
+ @ApiModelProperty("级别")
+ private String dictTypeLevel; // 级别
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeDto.java
new file mode 100644
index 00000000..dfdd2d32
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeDto.java
@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dicttype;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeDto.java
+ * Class: com.supervise.api.dicttype.DictTypeDto
+ * Description: 数据字典——数据类型 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型 数据传输对象", description = "数据字典——数据类型 数据传输对象")
+public class DictTypeDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("类型代码")
+ private String dictTypeCode; // 类型代码
+ @ApiModelProperty("类型名称")
+ private String dictTypeName; // 类型名称
+ @ApiModelProperty("级别")
+ private String dictTypeLevel; // 级别
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeFeign.java
new file mode 100644
index 00000000..627279d1
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeFeign.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dicttype;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeFeign.java
+ * Class: com.supervise.api.dicttype.DictTypeFeign
+ * Description: 数据字典——数据类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "数据字典——数据类型")
+@FeignClient(
+ contextId = "yxt-supervise-DictType",
+ name = "yxt-supervise",
+ path = "v1/dicttype",
+ fallback = DictTypeFeignFallback.class)
+public interface DictTypeFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody DictTypeDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeFeignFallback.java
new file mode 100644
index 00000000..389a55ba
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeFeignFallback.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dicttype;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeFeignFallback.java
+ * Class: com.supervise.api.dicttype.DictTypeFeignFallback
+ * Description: 数据字典——数据类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class DictTypeFeignFallback implements DictTypeFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt_supervise/dicttype/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(DictTypeDto dto){
+ return ResultBean.fireFail().setMsg("接口yxt_supervise/dicttype/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口yxt_supervise/dicttype/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt_supervise/dicttype/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeQuery.java
new file mode 100644
index 00000000..ba7d53e7
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeQuery.java
@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dicttype;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeQuery.java
+ * Class: com.supervise.api.dicttype.DictTypeQuery
+ * Description: 数据字典——数据类型 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型 查询条件", description = "数据字典——数据类型 查询条件")
+public class DictTypeQuery implements Query {
+
+ @ApiModelProperty("类型代码")
+ private String dictTypeCode; // 类型代码
+ @ApiModelProperty("类型名称")
+ private String dictTypeName; // 类型名称
+ @ApiModelProperty("级别")
+ private String dictTypeLevel; // 级别
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeVo.java
new file mode 100644
index 00000000..91da561f
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeVo.java
@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dicttype;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeVo.java
+ * Class: com.supervise.api.dicttype.DictTypeVo
+ * Description: 数据字典——数据类型 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型 视图数据对象", description = "数据字典——数据类型 视图数据对象")
+public class DictTypeVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("类型代码")
+ private String dictTypeCode; // 类型代码
+ @ApiModelProperty("类型名称")
+ private String dictTypeName; // 类型名称
+ @ApiModelProperty("级别")
+ private String dictTypeLevel; // 级别
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunction.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunction.java
similarity index 91%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunction.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunction.java
index b6a40666..5bd2a64b 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunction.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunction.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysfunction;
+package com.yxt.supervise.system.sysfunction;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysFunction.java
- * Class: com.yxt.anrui.portal.api.sysfunction.SysFunction
+ * Class: SysFunction
* Description: 功能.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionDto.java
similarity index 91%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionDto.java
index 1c52df81..997d30aa 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysfunction;
+package com.yxt.supervise.system.sysfunction;
import com.yxt.common.core.dto.Dto;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysFunctionDto.java
- * Class: com.yxt.anrui.portal.api.sysfunction.SysFunctionDto
+ * Class: SysFunctionDto
* Description: 功能 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionFeign.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionFeign.java
index 04ef1058..bfcafc6b 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionFeign.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysfunction;
+package com.yxt.supervise.system.sysfunction;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -16,7 +16,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysFunctionFeign.java
- * Class: com.yxt.anrui.portal.api.sysfunction.SysFunctionFeign
+ * Class: SysFunctionFeign
* Description: 功能.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionFeignFallback.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionFeignFallback.java
index 1dfc5351..02fced17 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysfunction;
+package com.yxt.supervise.system.sysfunction;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -10,7 +10,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysFunctionFeignFallback.java
- * Class: com.yxt.anrui.portal.api.sysfunction.SysFunctionFeignFallback
+ * Class: SysFunctionFeignFallback
* Description: 功能.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionQuery.java
similarity index 90%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionQuery.java
index 648787b5..b89be429 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysfunction;
+package com.yxt.supervise.system.sysfunction;
import com.yxt.common.core.query.Query;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysFunctionQuery.java
- * Class: com.yxt.anrui.portal.api.sysfunction.SysFunctionQuery
+ * Class: SysFunctionQuery
* Description: 功能 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionTreeVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionTreeVo.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionTreeVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionTreeVo.java
index 88bab74e..ce8b7afd 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionTreeVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionTreeVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysfunction;
+package com.yxt.supervise.system.sysfunction;
import com.yxt.common.core.vo.Vo;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionVo.java
similarity index 92%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionVo.java
index 7cbfbdad..b92613c6 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysfunction;
+package com.yxt.supervise.system.sysfunction;
import com.yxt.common.core.vo.Vo;
@@ -11,7 +11,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysFunctionVo.java
- * Class: com.yxt.anrui.portal.api.sysfunction.SysFunctionVo
+ * Class: SysFunctionVo
* Description: 功能 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SaveListDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SaveListDto.java
similarity index 91%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SaveListDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SaveListDto.java
index 57e5cc03..3a2d4d8e 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SaveListDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SaveListDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmapping;
+package com.yxt.supervise.system.sysmapping;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMapping.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMapping.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMapping.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMapping.java
index 16f2f40c..26674f94 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMapping.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMapping.java
@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.portal.api.sysmapping;
+package com.yxt.supervise.system.sysmapping;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -34,7 +34,7 @@ import lombok.Data;
/**
* Project: sysmapping(sysmapping)
* File: SysMapping.java
- * Class: com.yxt.anrui.portal.api.sysmapping.SysMapping
+ * Class: SysMapping
* Description: sys_mapping.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDetailsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingDetailsVo.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDetailsVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingDetailsVo.java
index 2078b99c..8752fd4a 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDetailsVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingDetailsVo.java
@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.portal.api.sysmapping;
+package com.yxt.supervise.system.sysmapping;
import com.yxt.common.core.vo.Vo;
@@ -34,7 +34,7 @@ import lombok.Data;
/**
* Project: sysmapping(sysmapping)
* File: SysMappingVo.java
- * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingVo
+ * Class: SysMappingVo
* Description: sys_mapping 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingDto.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingDto.java
index 500bbff1..0828952b 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingDto.java
@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.portal.api.sysmapping;
+package com.yxt.supervise.system.sysmapping;
import com.yxt.common.core.dto.Dto;
@@ -34,7 +34,7 @@ import lombok.Data;
/**
* Project: sysmapping(sysmapping)
* File: SysMappingDto.java
- * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingDto
+ * Class: SysMappingDto
* Description: sys_mapping 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingFeign.java
similarity index 97%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingFeign.java
index 00e6e041..4ca45875 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingFeign.java
@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.portal.api.sysmapping;
+package com.yxt.supervise.system.sysmapping;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -39,7 +39,7 @@ import java.util.Map;
/**
* Project: sysmapping(sysmapping)
* File: SysMappingFeign.java
- * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingFeign
+ * Class: SysMappingFeign
* Description: sys_mapping.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingFeignFallback.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingFeignFallback.java
index 972eba7b..dc3813bb 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingFeignFallback.java
@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.portal.api.sysmapping;
+package com.yxt.supervise.system.sysmapping;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -36,7 +36,7 @@ import java.util.Map;
/**
* Project: sysmapping(sysmapping)
* File: SysMappingFeignFallback.java
- * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingFeignFallback
+ * Class: SysMappingFeignFallback
* Description: sys_mapping.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoQuery.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoQuery.java
index 91a82748..2a6affbb 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmapping;
+package com.yxt.supervise.system.sysmapping;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQueryBatch.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoQueryBatch.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQueryBatch.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoQueryBatch.java
index 6efbf245..7b5b20b5 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQueryBatch.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoQueryBatch.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmapping;
+package com.yxt.supervise.system.sysmapping;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoVo.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoVo.java
index f6aa7a47..d0607e1f 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmapping;
+package com.yxt.supervise.system.sysmapping;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingListDto.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingListDto.java
index 5ed9c78a..35aa1027 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingListDto.java
@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.portal.api.sysmapping;
+package com.yxt.supervise.system.sysmapping;
import com.yxt.common.core.dto.Dto;
@@ -34,7 +34,7 @@ import lombok.Data;
/**
* Project: sysmapping(sysmapping)
* File: SysMappingDto.java
- * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingDto
+ * Class: SysMappingDto
* Description: sys_mapping 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListInfoQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingListInfoQuery.java
similarity index 87%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListInfoQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingListInfoQuery.java
index 7c12e177..4ea612f1 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListInfoQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingListInfoQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmapping;
+package com.yxt.supervise.system.sysmapping;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingQuery.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingQuery.java
index 52666564..04734be1 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingQuery.java
@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.portal.api.sysmapping;
+package com.yxt.supervise.system.sysmapping;
import com.yxt.common.core.query.Query;
@@ -34,7 +34,7 @@ import lombok.Data;
/**
* Project: sysmapping(sysmapping)
* File: SysMappingQuery.java
- * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingQuery
+ * Class: SysMappingQuery
* Description: sys_mapping 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingVo.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingVo.java
index 1cd66077..42573edb 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingVo.java
@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.anrui.portal.api.sysmapping;
+package com.yxt.supervise.system.sysmapping;
import com.yxt.common.core.vo.Vo;
@@ -34,7 +34,7 @@ import lombok.Data;
/**
* Project: sysmapping(sysmapping)
* File: SysMappingVo.java
- * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingVo
+ * Class: SysMappingVo
* Description: sys_mapping 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenu.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenu.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenu.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenu.java
index 56f579de..946b9a80 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenu.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenu.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmenu;
+package com.yxt.supervise.system.sysmenu;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysMenu.java
- * Class: com.yxt.anrui.portal.api.sysmenu.SysMenu
+ * Class: SysMenu
* Description: 菜单表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuDto.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuDto.java
index acb99077..729e6867 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmenu;
+package com.yxt.supervise.system.sysmenu;
import com.yxt.common.core.dto.Dto;
@@ -11,7 +11,7 @@ import javax.validation.constraints.NotBlank;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuDto.java
- * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuDto
+ * Class: SysMenuDto
* Description: 菜单表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuFeign.java
similarity index 97%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuFeign.java
index 92e86fdf..c288e5f6 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuFeign.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmenu;
+package com.yxt.supervise.system.sysmenu;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -18,7 +18,7 @@ import java.util.Map;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuFeign.java
- * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuFeign
+ * Class: SysMenuFeign
* Description: 菜单表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuFeignFallback.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuFeignFallback.java
index ba5bedac..d1b9071a 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmenu;
+package com.yxt.supervise.system.sysmenu;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -11,7 +11,7 @@ import java.util.Map;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuFeignFallback.java
- * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuFeignFallback
+ * Class: SysMenuFeignFallback
* Description: 菜单表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuQuery.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuQuery.java
index 0fccbb46..9cd063a5 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmenu;
+package com.yxt.supervise.system.sysmenu;
import com.yxt.common.core.query.Query;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuQuery.java
- * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuQuery
+ * Class: SysMenuQuery
* Description: 菜单表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuTreeVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuTreeVo.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuTreeVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuTreeVo.java
index 3bf2c324..fb677394 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuTreeVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuTreeVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmenu;
+package com.yxt.supervise.system.sysmenu;
import com.yxt.common.core.vo.Vo;
@@ -11,7 +11,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuVo.java
- * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuVo
+ * Class: SysMenuVo
* Description: 菜单表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuVo.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuVo.java
index ea793871..1e1509cf 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmenu;
+package com.yxt.supervise.system.sysmenu;
import com.yxt.common.core.vo.Vo;
@@ -11,7 +11,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuVo.java
- * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuVo
+ * Class: SysMenuVo
* Description: 菜单表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRole.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRole.java
similarity index 88%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRole.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRole.java
index dcbd4c0d..113446d9 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRole.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRole.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmenurole;
+package com.yxt.supervise.system.sysmenurole;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuRole.java
- * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRole
+ * Class: SysMenuRole
* Description: 菜单与角色关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleDto.java
similarity index 87%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleDto.java
index e5be54b5..9586079f 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmenurole;
+package com.yxt.supervise.system.sysmenurole;
import com.yxt.common.core.dto.Dto;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuRoleDto.java
- * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto
+ * Class: SysMenuRoleDto
* Description: 菜单与角色关联表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleFeign.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleFeign.java
index 0fad7970..9841f3ea 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleFeign.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmenurole;
+package com.yxt.supervise.system.sysmenurole;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -16,7 +16,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuRoleFeign.java
- * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleFeign
+ * Class: SysMenuRoleFeign
* Description: 菜单与角色关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleFeignFallback.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleFeignFallback.java
index f7751fb4..d7243111 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmenurole;
+package com.yxt.supervise.system.sysmenurole;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -10,7 +10,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuRoleFeignFallback.java
- * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleFeignFallback
+ * Class: SysMenuRoleFeignFallback
* Description: 菜单与角色关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleQuery.java
similarity index 89%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleQuery.java
index 78d9b608..ac5e45c4 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmenurole;
+package com.yxt.supervise.system.sysmenurole;
import com.yxt.common.core.query.Query;
@@ -11,7 +11,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuRoleQuery.java
- * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery
+ * Class: SysMenuRoleQuery
* Description: 菜单与角色关联表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleVo.java
similarity index 93%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleVo.java
index 6684020c..5c57f43c 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysmenurole;
+package com.yxt.supervise.system.sysmenurole;
import com.yxt.common.core.vo.Vo;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuRoleVo.java
- * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo
+ * Class: SysMenuRoleVo
* Description: 菜单与角色关联表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/QrCodeVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/QrCodeVo.java
similarity index 91%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/QrCodeVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/QrCodeVo.java
index d6314b55..21c09399 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/QrCodeVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/QrCodeVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysorganization;
+package com.yxt.supervise.system.sysorganization;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgListVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgListVo.java
similarity index 93%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgListVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgListVo.java
index 24e96309..dc380c3d 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgListVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgListVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysorganization;
+package com.yxt.supervise.system.sysorganization;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgStaffVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgStaffVo.java
similarity index 86%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgStaffVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgStaffVo.java
index 64b868b1..0d6de932 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgStaffVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgStaffVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysorganization;
+package com.yxt.supervise.system.sysorganization;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgVo.java
similarity index 93%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgVo.java
index e95df72c..b67ae0a6 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysorganization;
+package com.yxt.supervise.system.sysorganization;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganization.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganization.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganization.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganization.java
index 5f25abb3..b71fde97 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganization.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganization.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysorganization;
+package com.yxt.supervise.system.sysorganization;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysOrganization.java
- * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganization
+ * Class: SysOrganization
* Description: 组织机构表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationDto.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationDto.java
index 2cc2ecd1..06a74464 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysorganization;
+package com.yxt.supervise.system.sysorganization;
import com.yxt.common.core.dto.Dto;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysOrganizationDto.java
- * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationDto
+ * Class: SysOrganizationDto
* Description: 组织机构表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeign.java
similarity index 98%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeign.java
index ef389856..0de0d522 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeign.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysorganization;
+package com.yxt.supervise.system.sysorganization;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -16,7 +16,7 @@ import java.util.Map;
/**
* Project: anrui_portal(门户建设)
* File: SysOrganizationFeign.java
- * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign
+ * Class: SysOrganizationFeign
* Description: 组织机构表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeignFallback.java
similarity index 97%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeignFallback.java
index 29835104..fc189319 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysorganization;
+package com.yxt.supervise.system.sysorganization;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -11,7 +11,7 @@ import java.util.Map;
/**
* Project: anrui_portal(门户建设)
* File: SysOrganizationFeignFallback.java
- * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeignFallback
+ * Class: SysOrganizationFeignFallback
* Description: 组织机构表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListQuery.java
similarity index 85%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListQuery.java
index debd0cf1..934d446e 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysorganization;
+package com.yxt.supervise.system.sysorganization;
import com.yxt.common.core.query.Query;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListVo.java
similarity index 88%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListVo.java
index 584bfb9b..8d8e48b8 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysorganization;
+package com.yxt.supervise.system.sysorganization;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListsVo.java
similarity index 86%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListsVo.java
index a93ab2d4..fed2aa96 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListsVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysorganization;
+package com.yxt.supervise.system.sysorganization;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationQuery.java
similarity index 92%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationQuery.java
index f0c4267c..12ef5624 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysorganization;
+package com.yxt.supervise.system.sysorganization;
import com.yxt.common.core.query.Query;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysOrganizationQuery.java
- * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationQuery
+ * Class: SysOrganizationQuery
* Description: 组织机构表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java
index bbfefd8e..c23a25bf 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysorganization;
+package com.yxt.supervise.system.sysorganization;
import com.yxt.common.core.vo.Vo;
@@ -12,7 +12,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysOrganizationVo.java
- * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo
+ * Class: SysOrganizationVo
* Description: 组织机构表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPost.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPost.java
similarity index 91%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPost.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPost.java
index 5ecbfd12..becc7456 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPost.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPost.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syspost;
+package com.yxt.supervise.system.syspost;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysPost.java
- * Class: com.yxt.anrui.portal.api.syspost.SysPost
+ * Class: SysPost
* Description: 岗位.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostDto.java
similarity index 91%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostDto.java
index 772e1feb..58a7aa7d 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syspost;
+package com.yxt.supervise.system.syspost;
import com.yxt.common.core.dto.Dto;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysPostDto.java
- * Class: com.yxt.anrui.portal.api.syspost.SysPostDto
+ * Class: SysPostDto
* Description: 岗位 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostFeign.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostFeign.java
index 9abcc715..77073098 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostFeign.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syspost;
+package com.yxt.supervise.system.syspost;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -16,7 +16,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysPostFeign.java
- * Class: com.yxt.anrui.portal.api.syspost.SysPostFeign
+ * Class: SysPostFeign
* Description: 岗位.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostFeignFallback.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostFeignFallback.java
index f0b09fae..752dfbc3 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syspost;
+package com.yxt.supervise.system.syspost;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -10,7 +10,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysPostFeignFallback.java
- * Class: com.yxt.anrui.portal.api.syspost.SysPostFeignFallback
+ * Class: SysPostFeignFallback
* Description: 岗位.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostListVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostListVo.java
similarity index 92%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostListVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostListVo.java
index 1d95f4c3..75a07abe 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostListVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostListVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syspost;
+package com.yxt.supervise.system.syspost;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostQuery.java
similarity index 89%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostQuery.java
index dd59f965..ae037bc3 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syspost;
+package com.yxt.supervise.system.syspost;
import com.yxt.common.core.query.Query;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysPostQuery.java
- * Class: com.yxt.anrui.portal.api.syspost.SysPostQuery
+ * Class: SysPostQuery
* Description: 岗位 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostVo.java
similarity index 92%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostVo.java
index 48838895..13e5b65b 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syspost;
+package com.yxt.supervise.system.syspost;
import com.yxt.common.core.vo.Vo;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysPostVo.java
- * Class: com.yxt.anrui.portal.api.syspost.SysPostVo
+ * Class: SysPostVo
* Description: 岗位 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRole.java
similarity index 92%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRole.java
index 83b718f7..c52d93d6 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRole.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysrole;
+package com.yxt.supervise.system.sysrole;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysRole.java
- * Class: com.yxt.anrui.portal.api.sysrole.SysRole
+ * Class: SysRole
* Description: 角色.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleDto.java
similarity index 92%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleDto.java
index 5409e6c1..79be5caf 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysrole;
+package com.yxt.supervise.system.sysrole;
import com.yxt.common.core.dto.Dto;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysRoleDto.java
- * Class: com.yxt.anrui.portal.api.sysrole.SysRoleDto
+ * Class: SysRoleDto
* Description: 角色 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleFeign.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleFeign.java
index c099f36d..0e9de633 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleFeign.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysrole;
+package com.yxt.supervise.system.sysrole;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -14,7 +14,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysRoleFeign.java
- * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Class: SysRoleFeign
* Description: 角色.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleFeignFallback.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleFeignFallback.java
index cdea591b..fb7c27e1 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysrole;
+package com.yxt.supervise.system.sysrole;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -10,7 +10,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysRoleFeignFallback.java
- * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Class: SysRoleFeignFallback
* Description: 角色.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleQuery.java
similarity index 89%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleQuery.java
index 9b63027f..b8a2ea4c 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysrole;
+package com.yxt.supervise.system.sysrole;
import com.yxt.common.core.query.Query;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysRoleQuery.java
- * Class: com.yxt.anrui.portal.api.sysrole.SysRoleQuery
+ * Class: SysRoleQuery
* Description: 角色 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleVo.java
similarity index 92%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleVo.java
index 2912faea..3ead4a04 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysrole;
+package com.yxt.supervise.system.sysrole;
import com.yxt.common.core.vo.Vo;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysRoleVo.java
- * Class: com.yxt.anrui.portal.api.sysrole.SysRoleVo
+ * Class: SysRoleVo
* Description: 角色 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunction.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunction.java
similarity index 87%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunction.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunction.java
index ff617556..890f52d3 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunction.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunction.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysrolefunction;
+package com.yxt.supervise.system.sysrolefunction;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysRoleFunction.java
- * Class: com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunction
+ * Class: SysRoleFunction
* Description: 角色与功能关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionDto.java
similarity index 86%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionDto.java
index 672e49c2..cc2bf5bf 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysrolefunction;
+package com.yxt.supervise.system.sysrolefunction;
import com.yxt.common.core.dto.Dto;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysRoleFunctionDto.java
- * Class: com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunctionDto
+ * Class: SysRoleFunctionDto
* Description: 角色与功能关联表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionFeign.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionFeign.java
index 941b8936..250029a2 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionFeign.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysrolefunction;
+package com.yxt.supervise.system.sysrolefunction;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -16,7 +16,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysRoleFunctionFeign.java
- * Class: com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunctionFeign
+ * Class: SysRoleFunctionFeign
* Description: 角色与功能关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionFeignFallback.java
similarity index 93%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionFeignFallback.java
index 85d8d6a9..7f778ce7 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysrolefunction;
+package com.yxt.supervise.system.sysrolefunction;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -10,7 +10,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysRoleFunctionFeignFallback.java
- * Class: com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunctionFeignFallback
+ * Class: SysRoleFunctionFeignFallback
* Description: 角色与功能关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionQuery.java
similarity index 86%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionQuery.java
index 0742daff..11e699f7 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysrolefunction;
+package com.yxt.supervise.system.sysrolefunction;
import com.yxt.common.core.query.Query;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysRoleFunctionQuery.java
- * Class: com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunctionQuery
+ * Class: SysRoleFunctionQuery
* Description: 角色与功能关联表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionVo.java
similarity index 86%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionVo.java
index d89fee1a..f9bd3430 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysrolefunction;
+package com.yxt.supervise.system.sysrolefunction;
import com.yxt.common.core.vo.Vo;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysRoleFunctionVo.java
- * Class: com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunctionVo
+ * Class: SysRoleFunctionVo
* Description: 角色与功能关联表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSource.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSource.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSource.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSource.java
index a100bee1..b6e12dbb 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSource.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSource.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssource;
+package com.yxt.supervise.system.syssource;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysSource.java
- * Class: com.yxt.anrui.portal.api.syssource.SysSource
+ * Class: SysSource
* Description: 资源表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceDto.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceDto.java
index 4f86d863..ace1460c 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssource;
+package com.yxt.supervise.system.syssource;
import com.yxt.common.core.dto.Dto;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceDto.java
- * Class: com.yxt.anrui.portal.api.syssource.SysSourceDto
+ * Class: SysSourceDto
* Description: 资源表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceFeign.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceFeign.java
index ff636b61..793315fc 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceFeign.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssource;
+package com.yxt.supervise.system.syssource;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -16,7 +16,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceFeign.java
- * Class: com.yxt.anrui.portal.api.syssource.SysSourceFeign
+ * Class: SysSourceFeign
* Description: 资源表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceFeignFallback.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceFeignFallback.java
index 37a987b0..8f7708a8 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssource;
+package com.yxt.supervise.system.syssource;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -10,7 +10,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceFeignFallback.java
- * Class: com.yxt.anrui.portal.api.syssource.SysSourceFeignFallback
+ * Class: SysSourceFeignFallback
* Description: 资源表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceQuery.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceQuery.java
index 0ebbc834..6c83fcdc 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssource;
+package com.yxt.supervise.system.syssource;
import com.yxt.common.core.query.Query;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceQuery.java
- * Class: com.yxt.anrui.portal.api.syssource.SysSourceQuery
+ * Class: SysSourceQuery
* Description: 资源表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceVo.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceVo.java
index ade3948a..8cbb4dbf 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceVo.java
@@ -1,7 +1,7 @@
-package com.yxt.anrui.portal.api.syssource;
+package com.yxt.supervise.system.syssource;
-import com.yxt.anrui.portal.api.sysmenu.SysMenuVo;
+import com.yxt.supervise.system.sysmenu.SysMenuVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceVo.java
- * Class: com.yxt.anrui.portal.api.syssource.SysSourceVo
+ * Class: SysSourceVo
* Description: 资源表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunction.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunction.java
similarity index 88%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunction.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunction.java
index 6144abeb..83d49740 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunction.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunction.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcefunction;
+package com.yxt.supervise.system.syssourcefunction;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceFunction.java
- * Class: com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunction
+ * Class: SysSourceFunction
* Description: 资源与功能关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionDto.java
similarity index 85%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionDto.java
index faa42d87..87030672 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcefunction;
+package com.yxt.supervise.system.syssourcefunction;
import com.yxt.common.core.dto.Dto;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceFunctionDto.java
- * Class: com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionDto
+ * Class: SysSourceFunctionDto
* Description: 资源与功能关联表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionFeign.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionFeign.java
index bf61770f..debe0216 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionFeign.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcefunction;
+package com.yxt.supervise.system.syssourcefunction;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -16,7 +16,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceFunctionFeign.java
- * Class: com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionFeign
+ * Class: SysSourceFunctionFeign
* Description: 资源与功能关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionFeignFallback.java
similarity index 93%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionFeignFallback.java
index 3bcb326e..d9b75d94 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcefunction;
+package com.yxt.supervise.system.syssourcefunction;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -10,7 +10,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceFunctionFeignFallback.java
- * Class: com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionFeignFallback
+ * Class: SysSourceFunctionFeignFallback
* Description: 资源与功能关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionQuery.java
similarity index 85%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionQuery.java
index 646003ba..4021ef33 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcefunction;
+package com.yxt.supervise.system.syssourcefunction;
import com.yxt.common.core.query.Query;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceFunctionQuery.java
- * Class: com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionQuery
+ * Class: SysSourceFunctionQuery
* Description: 资源与功能关联表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionVo.java
similarity index 85%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionVo.java
index 516c709c..0eea8960 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcefunction;
+package com.yxt.supervise.system.syssourcefunction;
import com.yxt.common.core.vo.Vo;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceFunctionVo.java
- * Class: com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionVo
+ * Class: SysSourceFunctionVo
* Description: 资源与功能关联表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenu.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenu.java
similarity index 89%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenu.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenu.java
index c8e37347..0bfe548f 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenu.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenu.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcemenu;
+package com.yxt.supervise.system.syssourcemenu;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuRole.java
- * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRole
+ * Class: SysMenuRole
* Description: 菜单与资源关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuDto.java
similarity index 87%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuDto.java
index 99e8e141..655a02ad 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcemenu;
+package com.yxt.supervise.system.syssourcemenu;
import com.yxt.common.core.dto.Dto;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuRoleDto.java
- * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto
+ * Class: SysMenuRoleDto
* Description: 菜单与资源关联表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuFeign.java
similarity index 97%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuFeign.java
index 59c56257..6c1f00c0 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuFeign.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcemenu;
+package com.yxt.supervise.system.syssourcemenu;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuFeignFallback.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuFeignFallback.java
index e50c1d1d..7be74e83 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcemenu;
+package com.yxt.supervise.system.syssourcemenu;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuQuery.java
similarity index 86%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuQuery.java
index 35f0e195..2344a093 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcemenu;
+package com.yxt.supervise.system.syssourcemenu;
import com.yxt.common.core.query.Query;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuRoleQuery.java
- * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery
+ * Class: SysMenuRoleQuery
* Description: 菜单与资源关联表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuVo.java
similarity index 88%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuVo.java
index 132a03d4..a76b402f 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcemenu;
+package com.yxt.supervise.system.syssourcemenu;
import com.yxt.common.core.vo.Vo;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysMenuRoleVo.java
- * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo
+ * Class: SysMenuRoleVo
* Description: 菜单与资源关联表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRole.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRole.java
similarity index 88%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRole.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRole.java
index 67ad5cda..f0e5e75e 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRole.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRole.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcerole;
+package com.yxt.supervise.system.syssourcerole;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceRole.java
- * Class: com.yxt.anrui.portal.api.syssourcerole.SysSourceRole
+ * Class: SysSourceRole
* Description: 资源与角色的关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleDto.java
similarity index 86%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleDto.java
index 9ae52e5e..707d27dd 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcerole;
+package com.yxt.supervise.system.syssourcerole;
import com.yxt.common.core.dto.Dto;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceRoleDto.java
- * Class: com.yxt.anrui.portal.api.syssourcerole.SysSourceRoleDto
+ * Class: SysSourceRoleDto
* Description: 资源与角色的关联表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleFeign.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleFeign.java
index 6be81f98..0148310f 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleFeign.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcerole;
+package com.yxt.supervise.system.syssourcerole;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -16,7 +16,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceRoleFeign.java
- * Class: com.yxt.anrui.portal.api.syssourcerole.SysSourceRoleFeign
+ * Class: SysSourceRoleFeign
* Description: 资源与角色的关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleFeignFallback.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleFeignFallback.java
index 004a5cca..62d82bbc 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcerole;
+package com.yxt.supervise.system.syssourcerole;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -10,7 +10,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceRoleFeignFallback.java
- * Class: com.yxt.anrui.portal.api.syssourcerole.SysSourceRoleFeignFallback
+ * Class: SysSourceRoleFeignFallback
* Description: 资源与角色的关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleQuery.java
similarity index 86%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleQuery.java
index dda397ef..4bcd7a6a 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcerole;
+package com.yxt.supervise.system.syssourcerole;
import com.yxt.common.core.query.Query;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceRoleQuery.java
- * Class: com.yxt.anrui.portal.api.syssourcerole.SysSourceRoleQuery
+ * Class: SysSourceRoleQuery
* Description: 资源与角色的关联表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleVo.java
similarity index 86%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleVo.java
index 5f9648a5..400c4ee5 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.syssourcerole;
+package com.yxt.supervise.system.syssourcerole;
import com.yxt.common.core.vo.Vo;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysSourceRoleVo.java
- * Class: com.yxt.anrui.portal.api.syssourcerole.SysSourceRoleVo
+ * Class: SysSourceRoleVo
* Description: 资源与角色的关联表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/PcSysStaffQuery.java
similarity index 89%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/PcSysStaffQuery.java
index b13bfddb..38b330c8 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/PcSysStaffQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffinfo;
+package com.yxt.supervise.system.sysstaffinfo;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/PcSysStaffVo.java
similarity index 86%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/PcSysStaffVo.java
index 38d71fce..9a9220ae 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/PcSysStaffVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffinfo;
+package com.yxt.supervise.system.sysstaffinfo;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffQuery.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffQuery.java
index ce799682..44a0f3fe 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffinfo;
+package com.yxt.supervise.system.sysstaffinfo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.query.Query;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java
similarity index 98%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java
index 21eb9a9d..655c15ff 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffinfo;
+package com.yxt.supervise.system.sysstaffinfo;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -11,7 +11,7 @@ import java.util.Date;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffinfo.java
- * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo
+ * Class: SysStaffinfo
* Description: 人员基础信息表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java
similarity index 93%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java
index 440b7757..b9851d4d 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffinfo;
+package com.yxt.supervise.system.sysstaffinfo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoAppContactsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoAppContactsVo.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoAppContactsVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoAppContactsVo.java
index 7386c1aa..db389dd0 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoAppContactsVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoAppContactsVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffinfo;
+package com.yxt.supervise.system.sysstaffinfo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDetailsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDetailsVo.java
similarity index 97%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDetailsVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDetailsVo.java
index 23c2223d..04c7e9bc 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDetailsVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDetailsVo.java
@@ -1,7 +1,7 @@
-package com.yxt.anrui.portal.api.sysstaffinfo;
+package com.yxt.supervise.system.sysstaffinfo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDetailsVo;
-import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo;
+import com.yxt.supervise.system.sysstafforg.SysStaffOrgDetailsVo;
+import com.yxt.supervise.system.sysstaffpost.SysStaffPostDetailsVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java
index 3777727b..b03aef22 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java
@@ -1,9 +1,9 @@
-package com.yxt.anrui.portal.api.sysstaffinfo;
+package com.yxt.supervise.system.sysstaffinfo;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto;
-import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDto;
+import com.yxt.supervise.system.sysstafforg.SysStaffOrgDto;
+import com.yxt.supervise.system.sysstaffpost.SysStaffPostDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +16,7 @@ import java.util.Date;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffinfoDto.java
- * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoDto
+ * Class: SysStaffinfoDto
* Description: 人员基础信息表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java
index 144f9773..5f71ece3 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java
@@ -1,7 +1,7 @@
-package com.yxt.anrui.portal.api.sysstaffinfo;
+package com.yxt.supervise.system.sysstaffinfo;
-import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffQuery;
-import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo;
+import com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffQuery;
+import com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -18,7 +18,7 @@ import java.util.Map;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffinfoFeign.java
- * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign
+ * Class: SysStaffinfoFeign
* Description: 人员基础信息表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java
similarity index 91%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java
index 28d4cce3..b163c462 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java
@@ -1,7 +1,7 @@
-package com.yxt.anrui.portal.api.sysstaffinfo;
+package com.yxt.supervise.system.sysstaffinfo;
-import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffQuery;
-import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo;
+import com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffQuery;
+import com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -13,7 +13,7 @@ import java.util.Map;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffinfoFeignFallback.java
- * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeignFallback
+ * Class: SysStaffinfoFeignFallback
* Description: 人员基础信息表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java
similarity index 91%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java
index f1497437..d494c502 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffinfo;
+package com.yxt.supervise.system.sysstaffinfo;
import com.yxt.common.core.query.Query;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffinfoQuery.java
- * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoQuery
+ * Class: SysStaffinfoQuery
* Description: 人员基础信息表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java
similarity index 92%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java
index be0ac3db..6b69bb32 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffinfo;
+package com.yxt.supervise.system.sysstaffinfo;
import com.yxt.common.core.vo.Vo;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffinfoVo.java
- * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo
+ * Class: SysStaffinfoVo
* Description: 人员基础信息表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/WxBase64Query.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/WxBase64Query.java
similarity index 90%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/WxBase64Query.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/WxBase64Query.java
index 7d5cf911..848a5626 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/WxBase64Query.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/WxBase64Query.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffinfo;
+package com.yxt.supervise.system.sysstaffinfo;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/WxSysInfoQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/WxSysInfoQuery.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/WxSysInfoQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/WxSysInfoQuery.java
index c629a47b..fe05e109 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/WxSysInfoQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/WxSysInfoQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffinfo;
+package com.yxt.supervise.system.sysstaffinfo;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/app/AppSysStaffQuery.java
similarity index 92%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/app/AppSysStaffQuery.java
index f024454b..a16b8801 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/app/AppSysStaffQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffinfo.app;
+package com.yxt.supervise.system.sysstaffinfo.app;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/app/AppSysStaffVo.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/app/AppSysStaffVo.java
index e8971073..6dbec97c 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/app/AppSysStaffVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffinfo.app;
+package com.yxt.supervise.system.sysstaffinfo.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrg.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrg.java
similarity index 91%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrg.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrg.java
index e720c889..83600d72 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrg.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrg.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstafforg;
+package com.yxt.supervise.system.sysstafforg;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffOrg.java
- * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg
+ * Class: SysStaffOrg
* Description: 员工部门关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgDetailsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgDetailsVo.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgDetailsVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgDetailsVo.java
index aaed2018..0ccf8a79 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgDetailsVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgDetailsVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstafforg;
+package com.yxt.supervise.system.sysstafforg;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgDto.java
similarity index 91%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgDto.java
index 97a51fd3..41b0336d 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstafforg;
+package com.yxt.supervise.system.sysstafforg;
import com.yxt.common.core.dto.Dto;
@@ -11,7 +11,7 @@ import javax.validation.constraints.NotBlank;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffOrgDto.java
- * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto
+ * Class: SysStaffOrgDto
* Description: 员工部门关联表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeign.java
similarity index 97%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeign.java
index ade516b9..05720139 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeign.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstafforg;
+package com.yxt.supervise.system.sysstafforg;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -14,7 +14,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffOrgFeign.java
- * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign
+ * Class: SysStaffOrgFeign
* Description: 员工部门关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeignFallback.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeignFallback.java
index 3cecb5db..3902fbe2 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstafforg;
+package com.yxt.supervise.system.sysstafforg;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -10,7 +10,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffOrgFeignFallback.java
- * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeignFallback
+ * Class: SysStaffOrgFeignFallback
* Description: 员工部门关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgQuery.java
similarity index 90%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgQuery.java
index 3cd8f32b..9f7a1ad1 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstafforg;
+package com.yxt.supervise.system.sysstafforg;
import com.yxt.common.core.query.Query;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffOrgQuery.java
- * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgQuery
+ * Class: SysStaffOrgQuery
* Description: 员工部门关联表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgVo.java
similarity index 91%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgVo.java
index 8454f39e..cfdb66af 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstafforg;
+package com.yxt.supervise.system.sysstafforg;
import com.yxt.common.core.vo.Vo;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffOrgVo.java
- * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo
+ * Class: SysStaffOrgVo
* Description: 员工部门关联表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPost.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPost.java
similarity index 91%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPost.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPost.java
index 4d7fb840..b40b829c 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPost.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPost.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffpost;
+package com.yxt.supervise.system.sysstaffpost;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -12,7 +12,7 @@ import java.util.Date;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffPost.java
- * Class: com.yxt.anrui.portal.api.sysstaffpost.SysStaffPost
+ * Class: SysStaffPost
* Description: 员工岗位关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostDetailsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostDetailsVo.java
similarity index 92%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostDetailsVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostDetailsVo.java
index 19867dfc..3430e538 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostDetailsVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostDetailsVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffpost;
+package com.yxt.supervise.system.sysstaffpost;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostDto.java
similarity index 90%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostDto.java
index 54eac485..3a04a9e5 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffpost;
+package com.yxt.supervise.system.sysstaffpost;
import com.yxt.common.core.dto.Dto;
@@ -11,7 +11,7 @@ import javax.validation.constraints.NotBlank;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffPostDto.java
- * Class: com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDto
+ * Class: SysStaffPostDto
* Description: 员工岗位关联表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostFeign.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostFeign.java
index 844bf710..96a408a7 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostFeign.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffpost;
+package com.yxt.supervise.system.sysstaffpost;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -16,7 +16,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffPostFeign.java
- * Class: com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign
+ * Class: SysStaffPostFeign
* Description: 员工岗位关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostFeignFallback.java
similarity index 93%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostFeignFallback.java
index 8788c28e..b5c26ebf 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffpost;
+package com.yxt.supervise.system.sysstaffpost;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -10,7 +10,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffPostFeignFallback.java
- * Class: com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeignFallback
+ * Class: SysStaffPostFeignFallback
* Description: 员工岗位关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostQuery.java
similarity index 90%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostQuery.java
index 11d7fd58..2e77b810 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffpost;
+package com.yxt.supervise.system.sysstaffpost;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -12,7 +12,7 @@ import java.util.Date;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffPostQuery.java
- * Class: com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostQuery
+ * Class: SysStaffPostQuery
* Description: 员工岗位关联表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostVo.java
similarity index 91%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostVo.java
index 4d5f35fb..a6475384 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysstaffpost;
+package com.yxt.supervise.system.sysstaffpost;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -12,7 +12,7 @@ import java.util.Date;
/**
* Project: anrui_portal(门户建设)
* File: SysStaffPostVo.java
- * Class: com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostVo
+ * Class: SysStaffPostVo
* Description: 员工岗位关联表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUser.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUser.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java
index b9528fe3..ccd13d67 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUser.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser;
+package com.yxt.supervise.system.sysuser;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -12,7 +12,7 @@ import java.util.Date;
/**
* Project: anrui_portal(门户建设)
* File: SysUser.java
- * Class: com.yxt.anrui.portal.api.sysuser.SysUser
+ * Class: SysUser
* Description: 用户表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java
similarity index 92%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java
index 7b183ac3..a7ac5725 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser;
+package com.yxt.supervise.system.sysuser;
import com.yxt.common.core.dto.Dto;
@@ -11,7 +11,7 @@ import javax.validation.constraints.NotBlank;
/**
* Project: anrui_portal(门户建设)
* File: SysUserDto.java
- * Class: com.yxt.anrui.portal.api.sysuser.SysUserDto
+ * Class: SysUserDto
* Description: 用户表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java
similarity index 97%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java
index 4a8ea9fd..dada1936 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java
@@ -1,8 +1,8 @@
-package com.yxt.anrui.portal.api.sysuser;
+package com.yxt.supervise.system.sysuser;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
-import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
+import com.yxt.supervise.system.sysstaffinfo.SysStaffinfoVo;
+import com.yxt.supervise.system.sysuser.app.AppUserOrgInfoVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -21,7 +21,7 @@ import java.util.Map;
/**
* Project: anrui_portal(门户建设)
* File: SysUserFeign.java
- * Class: com.yxt.anrui.portal.api.sysuser.SysUserFeign
+ * Class: SysUserFeign
* Description: 用户表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java
similarity index 97%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java
index a021f1fc..e6bbadea 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java
@@ -1,6 +1,6 @@
-package com.yxt.anrui.portal.api.sysuser;
+package com.yxt.supervise.system.sysuser;
-import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
+import com.yxt.supervise.system.sysstaffinfo.SysStaffinfoVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -13,7 +13,7 @@ import java.util.Map;
/**
* Project: anrui_portal(门户建设)
* File: SysUserFeignFallback.java
- * Class: com.yxt.anrui.portal.api.sysuser.SysUserFeignFallback
+ * Class: SysUserFeignFallback
* Description: 用户表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserInfoVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserInfoVo.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserInfoVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserInfoVo.java
index 1b76779b..b5b18667 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserInfoVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserInfoVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser;
+package com.yxt.supervise.system.sysuser;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserListVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserListVo.java
similarity index 87%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserListVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserListVo.java
index e70c73e4..3cbf9f8d 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserListVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserListVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser;
+package com.yxt.supervise.system.sysuser;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserQuery.java
similarity index 93%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserQuery.java
index a62cd25c..f5073d09 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser;
+package com.yxt.supervise.system.sysuser;
import com.yxt.common.core.query.Query;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysUserQuery.java
- * Class: com.yxt.anrui.portal.api.sysuser.SysUserQuery
+ * Class: SysUserQuery
* Description: 用户表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java
index 1c60e344..ce27509a 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java
@@ -1,8 +1,8 @@
-package com.yxt.anrui.portal.api.sysuser;
+package com.yxt.supervise.system.sysuser;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.portal.api.sysuser.app.OrgList;
+import com.yxt.supervise.system.sysuser.app.OrgList;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +15,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysUserVo.java
- * Class: com.yxt.anrui.portal.api.sysuser.SysUserVo
+ * Class: SysUserVo
* Description: 用户表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/UserQuery.java
similarity index 91%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/UserQuery.java
index 20b9fa77..e764f937 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/UserQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser;
+package com.yxt.supervise.system.sysuser;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserRoleQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/UserRoleQuery.java
similarity index 90%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserRoleQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/UserRoleQuery.java
index 9800a2ea..8694f72c 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserRoleQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/UserRoleQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser;
+package com.yxt.supervise.system.sysuser;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppMySysUserInfo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppMySysUserInfo.java
similarity index 93%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppMySysUserInfo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppMySysUserInfo.java
index eda39171..b191aff8 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppMySysUserInfo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppMySysUserInfo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser.app;
+package com.yxt.supervise.system.sysuser.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppSysUserFeign.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppSysUserFeign.java
index eff2cc4e..ff15e898 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppSysUserFeign.java
@@ -1,7 +1,7 @@
-package com.yxt.anrui.portal.api.sysuser.app;
+package com.yxt.supervise.system.sysuser.app;
-import com.yxt.anrui.portal.api.sysuser.SysUserQuery;
-import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.supervise.system.sysuser.SysUserQuery;
+import com.yxt.supervise.system.sysuser.SysUserVo;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppSysUserFeignFallback.java
similarity index 93%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppSysUserFeignFallback.java
index d42c2244..4a41afa4 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppSysUserFeignFallback.java
@@ -1,7 +1,7 @@
-package com.yxt.anrui.portal.api.sysuser.app;
+package com.yxt.supervise.system.sysuser.app;
-import com.yxt.anrui.portal.api.sysuser.SysUserQuery;
-import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.supervise.system.sysuser.SysUserQuery;
+import com.yxt.supervise.system.sysuser.SysUserVo;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppUserOrgInfoVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppUserOrgInfoVo.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppUserOrgInfoVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppUserOrgInfoVo.java
index 7faf917e..0d2fb9cd 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppUserOrgInfoVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppUserOrgInfoVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser.app;
+package com.yxt.supervise.system.sysuser.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/MyInfoQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/MyInfoQuery.java
similarity index 90%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/MyInfoQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/MyInfoQuery.java
index d2c07260..9e8fcb83 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/MyInfoQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/MyInfoQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser.app;
+package com.yxt.supervise.system.sysuser.app;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/OrgList.java
similarity index 86%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/OrgList.java
index 39509c80..cd3ae345 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/OrgList.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser.app;
+package com.yxt.supervise.system.sysuser.app;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxHomePageVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxHomePageVo.java
similarity index 93%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxHomePageVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxHomePageVo.java
index 47d52b80..585f79e3 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxHomePageVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxHomePageVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser.wx;
+package com.yxt.supervise.system.sysuser.wx;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxMySysUserInfoVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxMySysUserInfoVo.java
similarity index 93%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxMySysUserInfoVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxMySysUserInfoVo.java
index b46297d1..af45805f 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxMySysUserInfoVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxMySysUserInfoVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser.wx;
+package com.yxt.supervise.system.sysuser.wx;
import com.yxt.common.core.utils.desensitized.Sensitive;
import com.yxt.common.core.utils.desensitized.SensitiveTypeEnum;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserDto.java
similarity index 96%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserDto.java
index 53dcca4b..02a39169 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser.wx;
+package com.yxt.supervise.system.sysuser.wx;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserFeign.java
similarity index 97%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserFeign.java
index 2e565ee2..573a2208 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserFeign.java
@@ -1,6 +1,6 @@
-package com.yxt.anrui.portal.api.sysuser.wx;
+package com.yxt.supervise.system.sysuser.wx;
-import com.yxt.anrui.portal.api.sysuser.SysUser;
+import com.yxt.supervise.system.sysuser.SysUser;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserFeignFallback.java
similarity index 79%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserFeignFallback.java
index 0b8e632f..601359cb 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser.wx;
+package com.yxt.supervise.system.sysuser.wx;
import org.springframework.stereotype.Component;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserLoginQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserLoginQuery.java
similarity index 94%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserLoginQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserLoginQuery.java
index 27d9f106..2faaf321 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserLoginQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserLoginQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser.wx;
+package com.yxt.supervise.system.sysuser.wx;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserVo.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserVo.java
index 185a3868..cc72b831 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuser.wx;
+package com.yxt.supervise.system.sysuser.wx;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRole.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRole.java
similarity index 88%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRole.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRole.java
index 8f523bfc..01486c44 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRole.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRole.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuserrole;
+package com.yxt.supervise.system.sysuserrole;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysUserRole.java
- * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRole
+ * Class: SysUserRole
* Description: 用户与角色关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleDto.java
similarity index 87%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleDto.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleDto.java
index 9e05eded..83a166d2 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleDto.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuserrole;
+package com.yxt.supervise.system.sysuserrole;
import com.yxt.common.core.dto.Dto;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysUserRoleDto.java
- * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleDto
+ * Class: SysUserRoleDto
* Description: 用户与角色关联表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleFeign.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeign.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleFeign.java
index c7a8a061..aa2e19f5 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeign.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleFeign.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuserrole;
+package com.yxt.supervise.system.sysuserrole;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -13,7 +13,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysUserRoleFeign.java
- * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign
+ * Class: SysUserRoleFeign
* Description: 用户与角色关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleFeignFallback.java
similarity index 95%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeignFallback.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleFeignFallback.java
index 39d4a86a..2f03daf7 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeignFallback.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleFeignFallback.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuserrole;
+package com.yxt.supervise.system.sysuserrole;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@@ -10,7 +10,7 @@ import java.util.List;
/**
* Project: anrui_portal(门户建设)
* File: SysUserRoleFeignFallback.java
- * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeignFallback
+ * Class: SysUserRoleFeignFallback
* Description: 用户与角色关联表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleQuery.java
similarity index 87%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleQuery.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleQuery.java
index 5d00a16b..6fb22345 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleQuery.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuserrole;
+package com.yxt.supervise.system.sysuserrole;
import com.yxt.common.core.query.Query;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysUserRoleQuery.java
- * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleQuery
+ * Class: SysUserRoleQuery
* Description: 用户与角色关联表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleVo.java
similarity index 87%
rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleVo.java
rename to yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleVo.java
index eeebadac..42ad219c 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleVo.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleVo.java
@@ -1,4 +1,4 @@
-package com.yxt.anrui.portal.api.sysuserrole;
+package com.yxt.supervise.system.sysuserrole;
import com.yxt.common.core.vo.Vo;
@@ -9,7 +9,7 @@ import lombok.Data;
/**
* Project: anrui_portal(门户建设)
* File: SysUserRoleVo.java
- * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo
+ * Class: SysUserRoleVo
* Description: 用户与角色关联表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/pom.xml b/yxt_supervise/supervise-system/supervise-system-biz/pom.xml
index b5edbd7d..8ca85b04 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/pom.xml
+++ b/yxt_supervise/supervise-system/supervise-system-biz/pom.xml
@@ -3,17 +3,141 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- supervise-system
- com.yxt.supervise
+ com.yxt
+ yxt-parent
0.0.1
+
4.0.0
-
+ com.yxt.supervise
+ 0.0.1
supervise-system-biz
-
- 15
- 15
-
+
+ com.yxt
+ yxt-common-base
+ 0.0.1
+
+
+ com.yxt.supervise
+ supervise-system-api
+ 0.0.1-SNAPSHOT
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+ mysql
+ mysql-connector-java
+ runtime
+
+
+
+ junit
+ junit
+ compile
+
+
+ javax.servlet
+ javax.servlet-api
+ 4.0.1
+ compile
+
+
+ com.github.xiaoymin
+ knife4j-spring-boot-starter
+
+
+ net.dongliu
+ apk-parser
+ 2.6.10
+
+
+
+ org.projectlombok
+ lombok
+ 1.18.24
+ true
+
+
+ javax.xml
+ jaxb-impl
+ 2.1
+
+
+ javax.xml
+ jaxb-api
+ 2.1
+
+
+ javax.xml.ws
+ jaxws-api
+ 2.3.1
+
+
+ javax.jws
+ javax.jws-api
+ 1.1
+
+
+ com.sun.xml.bind
+ jaxb-core
+ 2.3.0.1
+
+
+ javax.xml.soap
+ javax.xml.soap-api
+ 1.4.0
+
+
+ javax.activation
+ activation
+ 1.1.1
+
+
+
+ net.sourceforge.javacsv
+ javacsv
+ 2.0
+
+
+ de.siegmar
+ fastcsv
+ 2.2.1
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+ 2.5.6
+
+
+
+ repackage
+
+
+
+
+
+
+
+ src/main/java
+
+ **/*Mapper.xml
+
+
+
+ src/main/resources
+
+ **/*.*
+
+ false
+
+
+
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/SystemApplication.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/SystemApplication.java
new file mode 100644
index 00000000..5c4a1287
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/SystemApplication.java
@@ -0,0 +1,18 @@
+package com.yxt.supervise.system;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+@SpringBootApplication(scanBasePackages = {
+ "com.yxt.common.base.config",
+ "com.yxt.supervise.system"
+})
+@EnableDiscoveryClient
+@EnableFeignClients(basePackages = {"com.yxt.supervise.*"})
+public class SystemApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(SystemApplication.class, args);
+ }
+}
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonMapper.java
new file mode 100644
index 00000000..d7bbb7c0
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonMapper.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dictcommon;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonMapper.java
+ * Class: com.supervise.biz.dictcommon.DictCommonMapper
+ * Description: 数据字典——数据项.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface DictCommonMapper extends BaseMapper {
+
+ //@Update("update dict_common set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from dict_common")
+ List selectListVo();
+ @Select("select * from dict_common where dictkey=#{key}")
+ DictCommonDetailsVo fetchByKey(@Param("key")String key);
+ @Select("select * from dict_common where dictkey=#{key} and dictType=#{type}")
+ DictCommonDetailsVo fetchByKeyAndType(@Param("key")String key, @Param("type")String type);
+ @Select("select * from restricted_category where dictkey=#{key} and dictType=#{type}")
+ DictCommonDetailsVo fetchByKeyAndTypeForLimit(@Param("type")String category, @Param("key")String categoryKey);
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonMapper.xml
new file mode 100644
index 00000000..6c40cf41
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonRest.java
new file mode 100644
index 00000000..26400226
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonRest.java
@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dictcommon;
+
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonFeignFallback.java
+ * Class: com.supervise.biz.dictcommon.DictCommonRest
+ * Description: 数据字典——数据项.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "数据字典——数据项")
+@RestController("com.supervise.biz.dictcommon.DictCommonRest")
+@RequestMapping("v1/dictcommon")
+public class DictCommonRest implements DictCommonFeign {
+
+ @Autowired
+ private DictCommonService dictCommonService;
+
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = dictCommonService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody DictCommonDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ dictCommonService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ dictCommonService.delBySids(sids);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ DictCommonDetailsVo vo = dictCommonService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonService.java
new file mode 100644
index 00000000..bc1b4ca3
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonService.java
@@ -0,0 +1,115 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dictcommon;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonService.java
+ * Class: com.supervise.biz.dictcommon.DictCommonService
+ * Description: 数据字典——数据项 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class DictCommonService extends MybatisBaseService {
+ private QueryWrapper createQueryWrapper(DictCommonQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ DictCommonQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(DictCommonDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ this.insertByDto(dto);
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(DictCommonDto dto){
+ DictCommon entity = new DictCommon();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(DictCommonDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ DictCommon entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public DictCommonDetailsVo fetchDetailsVoBySid(String sid){
+ DictCommon entity = fetchBySid(sid);
+ DictCommonDetailsVo vo = new DictCommonDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+
+ public DictCommonDetailsVo fetchByKey(String value) {
+ DictCommonDetailsVo vo = baseMapper.fetchByKey(value);
+ return vo;
+ }
+
+ public DictCommonDetailsVo fetchByKeyAndType(String value, String type) {
+ DictCommonDetailsVo vo = baseMapper.fetchByKeyAndType(value,type);
+ return vo;
+ }
+
+ public DictCommonDetailsVo fetchByKeyAndTypeForLimit(String category, String categoryKey) {
+ DictCommonDetailsVo vo = baseMapper.fetchByKeyAndTypeForLimit(category,categoryKey);
+ return vo;
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dicttype/DictTypeMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dicttype/DictTypeMapper.java
new file mode 100644
index 00000000..b2de8ae7
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dicttype/DictTypeMapper.java
@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dicttype;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeMapper.java
+ * Class: com.supervise.biz.dicttype.DictTypeMapper
+ * Description: 数据字典——数据类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface DictTypeMapper extends BaseMapper {
+
+ //@Update("update dict_type set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from dict_type")
+ List selectListVo();
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dicttype/DictTypeMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dicttype/DictTypeMapper.xml
new file mode 100644
index 00000000..e60d7ede
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dicttype/DictTypeMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dicttype/DictTypeRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dicttype/DictTypeRest.java
new file mode 100644
index 00000000..daae39e0
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dicttype/DictTypeRest.java
@@ -0,0 +1,92 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dicttype;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeFeignFallback.java
+ * Class: com.supervise.biz.dicttype.DictTypeRest
+ * Description: 数据字典——数据类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "数据字典——数据类型")
+@RestController("com.supervise.biz.dicttype.DictTypeRest")
+@RequestMapping("v1/dicttype")
+public class DictTypeRest implements DictTypeFeign {
+
+ @Autowired
+ private DictTypeService dictTypeService;
+
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = dictTypeService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody DictTypeDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ dictTypeService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ dictTypeService.delBySids(sids);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ DictTypeDetailsVo vo = dictTypeService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dicttype/DictTypeService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dicttype/DictTypeService.java
new file mode 100644
index 00000000..54568f58
--- /dev/null
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/dicttype/DictTypeService.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.system.dicttype;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeService.java
+ * Class: com.supervise.biz.dicttype.DictTypeService
+ * Description: 数据字典——数据类型 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class DictTypeService extends MybatisBaseService {
+ private QueryWrapper createQueryWrapper(DictTypeQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ DictTypeQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(DictTypeDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ this.insertByDto(dto);
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(DictTypeDto dto){
+ DictType entity = new DictType();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(DictTypeDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ DictType entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public DictTypeDetailsVo fetchDetailsVoBySid(String sid){
+ DictType entity = fetchBySid(sid);
+ DictTypeDetailsVo vo = new DictTypeDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionMapper.java
similarity index 89%
rename from yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionMapper.java
rename to yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionMapper.java
index da4a08d4..145c31f5 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionMapper.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionMapper.java
@@ -1,13 +1,10 @@
-package com.yxt.supervise.portal.biz.sysfunction;
+package com.yxt.supervise.system.sysfunction;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.portal.api.sysfunction.SysFunction;
-import com.yxt.anrui.portal.api.sysfunction.SysFunctionTreeVo;
-import com.yxt.anrui.portal.api.sysfunction.SysFunctionVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionMapper.xml
similarity index 81%
rename from yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionMapper.xml
rename to yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionMapper.xml
index ecd80ee4..cb16d432 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionMapper.xml
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionMapper.xml
@@ -1,9 +1,9 @@
-
+
-