diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsBrandRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsBrandRest.java
similarity index 84%
rename from wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsBrandRest.java
rename to wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsBrandRest.java
index c07b9eb..29784ca 100644
--- a/wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsBrandRest.java
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsBrandRest.java
@@ -1,13 +1,13 @@
-package com.yxt.wms.apiadmin;
+package com.yxt.wms.apiadmin.func;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoService;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfo;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoDto;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoQuery;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoVo;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoService;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfo;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoDto;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoQuery;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsSpuRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsSpuRest.java
similarity index 89%
rename from wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsSpuRest.java
rename to wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsSpuRest.java
index 49488aa..53acffd 100644
--- a/wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsSpuRest.java
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsSpuRest.java
@@ -1,12 +1,12 @@
-package com.yxt.wms.apiadmin;
+package com.yxt.wms.apiadmin.func;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuService;
-import com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuDto;
-import com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuQuery;
-import com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuVo;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuService;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuDto;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuQuery;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsTypeRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsTypeRest.java
similarity index 95%
rename from wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsTypeRest.java
rename to wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsTypeRest.java
index 1db4c54..9ffa8e1 100644
--- a/wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsTypeRest.java
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsTypeRest.java
@@ -1,9 +1,10 @@
-package com.yxt.wms.apiadmin;
+package com.yxt.wms.apiadmin.func;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basegoodstype.*;
+
+import com.yxt.wms.biz.func.basegoodstype.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsUnitRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsUnitRest.java
similarity index 95%
rename from wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsUnitRest.java
rename to wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsUnitRest.java
index f124a02..72ffcf5 100644
--- a/wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsUnitRest.java
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsUnitRest.java
@@ -1,9 +1,9 @@
-package com.yxt.wms.apiadmin;
+package com.yxt.wms.apiadmin.func;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basegoodsunit.*;
+import com.yxt.wms.biz.func.basegoodsunit.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseManufacturerRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseManufacturerRest.java
similarity index 96%
rename from wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseManufacturerRest.java
rename to wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseManufacturerRest.java
index 0b12066..5e40a9c 100644
--- a/wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseManufacturerRest.java
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseManufacturerRest.java
@@ -1,9 +1,9 @@
-package com.yxt.wms.apiadmin;
+package com.yxt.wms.apiadmin.func;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basemanufacturer.*;
+import com.yxt.wms.biz.func.basemanufacturer.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseSupplierInfoRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseSupplierInfoRest.java
similarity index 95%
rename from wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseSupplierInfoRest.java
rename to wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseSupplierInfoRest.java
index 634d397..661c8f3 100644
--- a/wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseSupplierInfoRest.java
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseSupplierInfoRest.java
@@ -23,12 +23,12 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.apiadmin;
+package com.yxt.wms.apiadmin.func;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basesupplierinfo.*;
+import com.yxt.wms.biz.func.basesupplierinfo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,7 +80,7 @@ public class BaseSupplierInfoRest {
 
 	@ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean< BaseSupplierInfoDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<BaseSupplierInfoDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
 		return baseSupplierInfoService.fetchDetailsVoBySid(sid);
 	}
 
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/DictCommonRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/DictCommonRest.java
new file mode 100644
index 0000000..7b7a49c
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/DictCommonRest.java
@@ -0,0 +1,101 @@
+package com.yxt.wms.apiadmin.func;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.wms.biz.func.dictcommon.*;
+import com.yxt.wms.biz.func.dicttype.DictTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/5 21:29
+ * @description
+ */
+@Slf4j
+@Controller
+@RequestMapping("apiadmin/dictcommons")
+@Api(tags = "数据字典数据项管理")
+public class DictCommonRest {
+
+    @Autowired
+    private DictTypeService dictTypeService;
+
+    @Autowired
+    private DictCommonService dictCommonService;
+
+    @PostMapping(value = "/save")
+    @ResponseBody
+    @ApiOperation(value = "数据字典数据项保存")
+    ResultBean save(@Valid @RequestBody DictCommonDto dictCommonDto) {
+        return dictCommonService.save(dictCommonDto);
+    }
+
+    @PostMapping("/pageList")
+    @ResponseBody
+    @ApiOperation(value = "数据字典数据项分页列表")
+    ResultBean<PagerVo<DictCommonVo>> pageList(@RequestBody PagerQuery<DictCommonQuery> pagerQuery) {
+        return dictCommonService.pageList(pagerQuery);
+    }
+
+    @PostMapping("/update/{sid}")
+    @ResponseBody
+    @ApiOperation(value = "数据字典修改后保存")
+    ResultBean update(@Valid @RequestBody DictCommonDto dictCommonDto, @ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid){
+
+        return dictCommonService.updateBySid(dictCommonDto, sid);
+    }
+
+    @ResponseBody
+    @DeleteMapping("/delete/{sid}")
+    @ApiOperation(value = "删除")
+    ResultBean delete(@ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid){
+        return dictCommonService.del(sid);
+    }
+
+    @GetMapping("/typeValues")
+    @ResponseBody
+    @ApiOperation("下拉框的获取")
+    ResultBean<List<DictCommonVo>> getTypeValues(@RequestParam("type") String type,  @RequestParam(value = "psid", defaultValue = "0")String psid){
+        return dictCommonService.getValue(type,psid);
+    }
+
+    @ResponseBody
+    @GetMapping("/selectBykey/{key}/{type}")
+    @ApiOperation(value = "数据字典信息修改时的初始化信息")
+    public ResultBean<DictCommonVo> selectBykey(@ApiParam(value = "数据字典key", required = true) @PathVariable("key") String key, @ApiParam(value = "数据字典type", required = true) @PathVariable("type") String type) {
+
+        return  dictCommonService.selectBykey(key, type);
+    }
+
+    @GetMapping("/getFirstDictKeyByType")
+    @ResponseBody
+    @ApiOperation("根据数据字典的key获取第一个值（默认值）")
+    ResultBean getFirstDictKeyByType(@RequestParam("dictType") String dictType, @RequestParam("psid") String psid){
+        ResultBean<List<DictCommonVo>> resultBean = getTypeValues(dictType, psid);
+        if (resultBean.getSuccess() && resultBean.getData() != null) {
+            String dictKey = resultBean.getData().get(0).getDictKey();
+            return new ResultBean().success().setData(dictKey);
+        } else {
+            return new ResultBean().fail().setData(new DictCommon());
+        }
+    }
+
+    @GetMapping("/getTypeValueList")
+    @ResponseBody
+    @ApiOperation("根据分类编码和数据分组查询数据字典")
+    ResultBean<List<DictCommonVo>> getTypeValueList(@RequestParam("type")String type,@RequestParam("groupNum")String groupNum){
+        return dictCommonService.getList(type,groupNum);
+    }
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/DictTypeRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/DictTypeRest.java
new file mode 100644
index 0000000..abf1c3a
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/DictTypeRest.java
@@ -0,0 +1,66 @@
+package com.yxt.wms.apiadmin.func;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.wms.biz.func.dictcommon.DictCommon;
+import com.yxt.wms.biz.func.dictcommon.DictCommonService;
+import com.yxt.wms.biz.func.dicttype.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/5 22:37
+ * @description
+ */
+@Slf4j
+@Controller
+@RequestMapping("apiadmin/dicttypes")
+@Api(tags = "数据字典类型管理")
+public class DictTypeRest{
+
+    @Autowired
+    private DictTypeService dictTypeService;
+
+    @Autowired
+    private DictCommonService dictCommonService;
+
+
+    @PostMapping(value = "/save")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型保存")
+    ResultBean save(@Valid @RequestBody DictTypeDto dictTypeDto){
+        return dictTypeService.save(dictTypeDto);
+    }
+    @PostMapping("/pageList")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型分页列表")
+    ResultBean<PagerVo<DictTypeVo>> pageList(@RequestBody PagerQuery<DictTypeQuery> pagerQuery){
+        return dictTypeService.pageList(pagerQuery);
+    }
+
+    @PostMapping("/update/{sid}")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型更新")
+    ResultBean update(@Valid DictTypeDto dictTypeDto, @ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid){
+        return dictTypeService.updateBySid(dictTypeDto, sid);
+    }
+
+    @DeleteMapping("/delete/{sid}")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型删除")
+    ResultBean delete(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid){
+        return dictTypeService.del(sid);
+    }
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysMenuRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysMenuRest.java
new file mode 100644
index 0000000..021a58d
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysMenuRest.java
@@ -0,0 +1,173 @@
+package com.yxt.wms.apiadmin.func;
+
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysmenu.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui_wms(门户建设) <br/>
+ * File: SysMenuFeignFallback.java <br/>
+ * Class: com.yxt.user.biz.sysmenu.SysMenuRest <br/>
+ * Description: 菜单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "菜单表")
+@RestController
+@RequestMapping("apiadmin/sysmenu")
+public class SysMenuRest {
+
+    @Autowired
+    SysMenuService sysMenuService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysMenuVo>> listPage(@RequestBody PagerQuery<SysMenuQuery> pq) {
+
+        return sysMenuService.listPageVo(pq);
+    }
+
+  /*  @Override
+    public ResultBean<List<SysMenuVo>> listAll(@RequestBody SysMenuQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        List<SysMenuVo> list = sysMenuService.listAllVo(query);
+        return rb.success().setData(list);
+    }*/
+
+    /**
+     * 菜单列表：根据资源归类
+     *
+     * @param query
+     * @return
+     */
+    @ApiOperation("菜单列表：根据资源归类")
+    @PostMapping("/listAllVoForSource")
+    public ResultBean<List<SysMenuTreeVo>> listAllVoForSource(@RequestBody SysMenuQuery query){
+        return sysMenuService.listAllVoForSource(query);
+    }
+
+    /**
+     * 菜单列表：根据资源归类 设置功能的url用
+     * @return
+     */
+    @ApiOperation("菜单列表：根据资源归类 设置功能的url用")
+    @PostMapping("/getMenusForFunction")
+    public ResultBean<List<Map<String,String>>> getMenusForFunction(@RequestBody SysMenuFunctionQuery sysMenuFunctionQuery) {
+        return sysMenuService.getMenusForFunction(sysMenuFunctionQuery);
+    }
+    private void makeMenuListForChildren(SysMenuTreeVo s, List<Map<String,String>> l){
+        List<SysMenuTreeVo> children = s.getChildren();
+        int size = children.size();
+        for (int i=0;i<size;i++){
+            makeMenuListForChildren( children.get(i), l) ;
+        }
+        String menuUrl = s.getMenuUrl();
+        if(StringUtils.isNotBlank(menuUrl)){
+            Map<String,String> m=new HashMap<>();
+            m.put("name",s.getName());
+            m.put("url",s.getMenuUrl());
+            m.put("sid",s.getSid());
+            l.add(m);
+        }
+
+    }
+    @ApiOperation("根据用户sid查询所有数据列表 ")
+    @PostMapping("/sourceMenuTreeByUserSid")
+    public ResultBean<List<Map<String, Object>>> sourceMenuTreeByUserSid(@RequestBody SysMenuQuery query){
+        return sysMenuService.sourceMenuTreeByUserSid(query);
+    }
+    @ApiOperation("根据资源sid查询所有数据列表 ")
+    @PostMapping("/sourcemenutree")
+    public ResultBean<List<Map<String, Object>>> sourcemenutree(@RequestBody SysMenuQuery query) {
+
+        return sysMenuService.sourcemenutree(query);
+    }
+
+    @ApiOperation("根据角色sid条件查询所有数据列表")
+    @PostMapping("/listAllByRoleSid")
+    public ResultBean<List<SysMenuVo>> listAllByRoleSid(@RequestBody SysMenuQuery query) {
+        return sysMenuService.listAllByRoleSid(query);
+    }
+
+
+    public ResultBean<List<SysMenuVo>> list() {
+        ResultBean rb = ResultBean.fireFail();
+        return sysMenuService.listVo();
+    }
+
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@Valid @RequestBody SysMenuDto dto) {
+        return sysMenuService.saveMenu(dto);
+    }
+
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@Valid @RequestBody SysMenuDto dto, @PathVariable("sid") String sid){
+        return sysMenuService.updateBySid(dto, sid);
+    }
+
+    /**
+     * 修改是否可用的状态
+     *
+     * @param sid      菜单sid或资源sid
+     * @param isEnable 是否可用的状态：1可用，0不可用
+     * @return
+     */
+    @ApiOperation("修改是否可用的状态 ")
+    @PostMapping("/updateIsEnable/{sid}/{isEnable}")
+    public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") Integer isEnable) {
+        return sysMenuService.updateIsEnable(sid,isEnable);
+    }
+
+ /*   @Override
+    public ResultBean del(String ids) {
+        ResultBean rb = ResultBean.fireFail();
+        sysMenuService.delByIds(ids);
+        return rb.success();
+    }*/
+    /**
+     * 根据当前行sid删除菜单
+     *
+     * @param sid 菜单sid
+     * @return
+     */
+    @ApiOperation("删除记录 根据sid")
+    @GetMapping("/delBySids/{sid}")
+    public ResultBean delBySids(@PathVariable("sid") String sid) {
+        return sysMenuService.delBySids(sid);
+    }
+
+ /*   @Override
+    public ResultBean<SysMenuVo> fetch(String id) {
+        ResultBean rb = ResultBean.fireFail();
+        SysMenuVo vo = sysMenuService.fetchByIdVo(id);
+        return rb.success().setData(vo);
+    }
+
+
+    public ResultBean<SysMenuVo> fetchBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        SysMenu sysMenu = sysMenuService.fetchBySid(sid);
+        SysMenuVo vo = new SysMenuVo();
+        BeanUtil.copyProperties(sysMenu, vo);
+        return rb.success().setData(vo);
+    }*/
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysMenuRoleRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysMenuRoleRest.java
new file mode 100644
index 0000000..a286de2
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysMenuRoleRest.java
@@ -0,0 +1,116 @@
+package com.yxt.wms.apiadmin.func;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysmenurole.*;
+import com.yxt.wms.biz.func.sysrole.SysRoleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleRest <br/>
+ * Description: 菜单与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "菜单与角色关联表")
+@RestController
+@RequestMapping("apiadmin/sysmenurole")
+public class SysMenuRoleRest {
+    @Autowired
+    private SysMenuRoleService sysMenuRoleService;
+    @Autowired
+    private SysRoleService sysRoleService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysMenuRoleVo>> listPage(@RequestBody PagerQuery<SysMenuRoleQuery> pq){
+        return sysMenuRoleService.listPageVo(pq);
+    }
+
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<SysMenuRoleVo>> listAll(@RequestBody SysMenuRoleQuery query){
+        return sysMenuRoleService.listAllVo(query);
+    }
+
+    @ApiOperation("根据角色查询授权的菜单列表(PC)")
+    @PostMapping("/selMenuByRole")
+    public ResultBean<List<SysMenuRoleDataVo>> selMenuByRole(@RequestBody SysMenuRoleDataQuery query) {
+        return sysMenuRoleService.selMenuByRole(query);
+    }
+
+    @ApiOperation("根据角色查询授权的菜单列表(APP)")
+    @PostMapping("/selMenuByRoleApp")
+    public ResultBean<List<SysMenuRoleDataVo>> selMenuByRoleApp(@RequestBody SysMenuRoleDataQuery query) {
+        return sysMenuRoleService.selMenuByRoleApp(query);
+    }
+
+    @ApiOperation("修改角色菜单的数据权限（PC）")
+    @PostMapping("/updateDataByRoleMenu")
+    public ResultBean updateDataByRoleMenu(@RequestBody List<SysMenuRoleDataDto> dtos) {
+        return sysMenuRoleService.updateDataByRoleMenu(dtos);
+    }
+
+    @ApiOperation("修改角色菜单的数据权限（移动端）")
+    @PostMapping("/updateDataByRoleMenuApp")
+    public ResultBean updateDataByRoleMenuApp(@RequestBody List<SysMenuRoleDataDto> dtos) {
+        return sysMenuRoleService.updateDataByRoleMenuApp(dtos);
+    }
+
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<SysMenuRoleVo>> list(){
+        return sysMenuRoleService.listVo();
+    }
+
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysMenuRoleDto dto){
+        return sysMenuRoleService.saveOrUpdateDto(dto);
+    }
+
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody SysMenuRoleDto dto,@PathVariable("sid") String sid){
+        ResultBean rb = ResultBean.fireFail();
+        return sysMenuRoleService.updateBySid(dto,sid);
+    }
+
+
+    @ApiOperation("修改角色的菜单配置")
+    @PostMapping("/updateRoleAndMenu")
+    public ResultBean updateRoleAndMenu(@RequestBody SysMenuRoleDto dto) {
+
+        return sysMenuRoleService.updateRoleAndMenu(dto);
+    }
+
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids){
+        return sysMenuRoleService.del(ids);
+    }
+
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<SysMenuRoleVo> fetch(@PathVariable("id") String id){
+        return sysMenuRoleService.fetchByIdVo(id);
+    }
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysOrganizationRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysOrganizationRest.java
new file mode 100644
index 0000000..21483b1
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysOrganizationRest.java
@@ -0,0 +1,273 @@
+package com.yxt.wms.apiadmin.func;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.config.RedisUtil;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.utils.QRCodeUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysorganization.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.File;
+import java.util.*;
+
+import static java.util.stream.Collectors.toList;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationFeignFallback.java <br/>
+ * Class: SysOrganizationRest <br/>
+ * Description: 组织机构表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "组织机构表")
+@RestController
+@RequestMapping("apiadmin/sysorganization")
+public class SysOrganizationRest {
+
+    @Autowired
+    private SysOrganizationService sysOrganizationService;
+
+    @Autowired
+    private RedisUtil redisUtil;
+
+    @PostMapping("/saveSysOrg")
+    public ResultBean saveOrg(@RequestBody SysOrganizationDto dto){
+        return sysOrganizationService.saveOrg(dto);
+    }
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysOrganizationVo>> listPage(@RequestBody PagerQuery<SysOrganizationQuery> pq) {
+        return sysOrganizationService.listPageVo(pq);
+    }
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<SysOrganizationVo>> listAll(@RequestBody SysOrganizationQuery query) {
+        return sysOrganizationService.listAllVo(query);
+    }
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<SysOrganizationVo>> list() {
+        return sysOrganizationService.listVo();
+    }
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysOrganizationDto dto) {
+        return sysOrganizationService.saveOrUpdateDto(dto);
+    }
+
+    @ApiOperation("一级组织机构列表")
+    @GetMapping("/selectFirstOrgList")
+    public ResultBean<List<SysOrganizationVo>> selectFirstOrgList(){
+        return sysOrganizationService.selectFirstOrgList();
+    }
+
+    @ApiOperation("根据父级sid查询子集列表")
+    @GetMapping("/selectChildrenListBySid/{sid}")
+    public ResultBean<List<SysOrganizationVo>> selectChildrenListBySid(@PathVariable("sid") String sid) {
+        return sysOrganizationService.selectChildrenListBySid(sid);
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean update(SysOrganizationDto dto, String sid){
+        return sysOrganizationService.updateBySid(dto, sid);
+    }
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids){
+        return sysOrganizationService.del(ids);
+    }
+
+    @ApiOperation("删除记录 根据sid")
+    @GetMapping("/delBySid/{sid}")
+    public ResultBean delBySid(@PathVariable("sid") String sid){
+
+        return sysOrganizationService.deIds(sid);
+    }
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<SysOrganizationVo> fetch(@PathVariable("id") String id){
+        return sysOrganizationService.fetchByIdVo(id);
+    }
+
+    @ApiOperation("获取一条记录 根据sid")
+    @ResponseBody
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<SysOrganizationVo> fetchBySid(@PathVariable("sid") String sid){
+        ResultBean rb = ResultBean.fireFail();
+
+        return sysOrganizationService.fetchBySidVo(sid);
+    }
+
+    @ApiOperation("手机获取组织架构")
+    @ResponseBody
+    @GetMapping("/selectAppOrganization")
+    public ResultBean<Map<String, Object>> selectAppOrganization(@RequestParam(value = "sid", required = false) String sid) {
+        return sysOrganizationService.selectAppOrganization(sid);
+    }
+
+
+    @ApiOperation("组织架构")
+    @ResponseBody
+    @GetMapping("/selectListOrg")
+    ResultBean<List<SysOrgVo>> selectListOrg(){
+        return sysOrganizationService.treeList();
+    }
+
+
+    @ApiOperation("获取到分公司")
+    @ResponseBody
+    @GetMapping("/getListOrg")
+    ResultBean<List<SysOrgVo>> getListOrg(){
+        return sysOrganizationService.getListOrg();
+    }
+
+    @ApiOperation("获取同品牌下分公司")
+    @ResponseBody
+    @GetMapping("/getListOrgByBrand/{orgSid}")
+    ResultBean<List<SysOrgVo>> getListOrgByBrand(@PathVariable(value = "orgSid") String orgSid){
+        return null;//sysOrganizationService.getListOrgByBrand(orgSid);
+    }
+
+    @ApiOperation("获取指定品牌下分公司(已筛选本分公司)")
+    @ResponseBody
+    @GetMapping("/getListOrgByBrandSid/{orgSid}/{brandSid}")
+    ResultBean<List<SysOrgVo>> getListOrgByBrandSid(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid){
+        return null;//sysOrganizationService.getListOrgByBrandSid(orgSid,brandSid);
+    }
+
+    @ApiOperation("获取指定品牌下分公司(未筛选本分公司)")
+    @ResponseBody
+    @GetMapping("/getListOrgByBrandSidNo/{orgSid}/{brandSid}")
+    ResultBean<List<SysOrgVo>> getListOrgByBrandSidNo(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid){
+        return null;//sysOrganizationService.getListOrgByBrandSidNo(orgSid,brandSid);
+    }
+
+    @ApiOperation("获取指定分公司下部门信息")
+    @ResponseBody
+    @GetMapping("/getListDeptByOrgSid/{orgSid}")
+    ResultBean<List<SysOrgVo>> getListDeptByOrgSid(@PathVariable(value = "orgSid") String orgSid){
+        return sysOrganizationService.getListDeptByOrgSid(orgSid);
+    }
+
+
+    @ApiOperation("根据业务员sid获取到分公司")
+    @ResponseBody
+    @GetMapping("/getUseOrgByUserSid")
+    ResultBean<SysOrganizationVo> getUseOrgByUserSid(@RequestParam("userSid") String userSid){
+        ResultBean<SysOrganizationVo> rb = ResultBean.fireFail();
+        SysOrganizationVo vo = sysOrganizationService.getUseOrgByUserSid(userSid);
+        return rb.success().setData(vo);
+    }
+
+
+    @ApiOperation("根据部门sid查询组织信息")
+    @ResponseBody
+    @GetMapping("/selectBySid")
+    ResultBean<SysOrganization> selectBySid(@RequestParam("sid") String sid){
+        return sysOrganizationService.selectBySid(sid);
+    }
+
+
+    @ApiOperation("根据组织架构sid查询组织下所有分公司")
+    @ResponseBody
+    @GetMapping("/selectUseOrgSidBySid")
+    ResultBean<List<Map<String, String>>> selectUseOrgSidBySid(@RequestParam("sid") String sid){
+        return sysOrganizationService.selectUseOrgSidBySid(sid);
+    }
+
+    /**
+     * 查询公司所有的部门
+     *
+     * @return
+     */
+    @ApiOperation("所在部门下拉")
+    @ResponseBody
+    @GetMapping("/selectListOne")
+    ResultBean<List<SysOrgListVo>> selectListOne(){
+        return sysOrganizationService.selectListOne();
+    }
+
+    @PostMapping("/getQrCode/{sid}")
+    @ResponseBody
+    @ApiOperation("查看二维码")
+    public ResultBean<QrCodeVo> getQrCode(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid) {
+        return sysOrganizationService.getQrCode(sid);
+    }
+
+
+    @GetMapping("/getOrgSid/{sid}")
+    @ResponseBody
+    @ApiOperation("根据当前用户的所在组织获取当前用户所在的分公司")
+    ResultBean<String> getOrgSid(@PathVariable(value = "sid") String sid){
+        return sysOrganizationService.getOrgSid(sid);
+    }
+
+    @GetMapping("/selectOrgList")
+    @ResponseBody
+    @ApiOperation("当前分公司销售部门及部门人员")
+    ResultBean<List<SysOrganizationListVo>> selectOrgList(@SpringQueryMap SysOrganizationListQuery query){
+        return sysOrganizationService.selectOrgList(query);
+    }
+
+
+    @GetMapping("/selectOrgLists")
+    @ResponseBody
+    @ApiOperation("当前分公司下所有部门")
+    ResultBean<List<SysOrganizationListsVo>> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query){
+        return sysOrganizationService.selectOrgLists(query);
+    }
+
+
+    @GetMapping("/selectByPSid")
+    @ResponseBody
+    @ApiOperation("查询分公司下的销售支持部")
+    ResultBean<SysOrganizationVo> selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name){
+        return sysOrganizationService.selectByPSid(sid,name);
+    }
+
+    @GetMapping("/selectOrgSidList")
+    @ResponseBody
+    @ApiOperation("所有分公司sid")
+    ResultBean<List<SysOrganizationVo>> selectOrgSidList() {
+        return sysOrganizationService.selectOrgSidList();
+    }
+
+
+    @GetMapping("/selectOrgByPSid")
+    @ResponseBody
+    @ApiOperation("查询事业部下所有分公司")
+    ResultBean<List<SysOrganizationVo>> selectOrgByPSid(@RequestParam("psid") String psid){
+        return sysOrganizationService.selectOrgByPSid(psid);
+    }
+
+
+    @GetMapping("/selectByOrgSidPath")
+    @ResponseBody
+    @ApiOperation("组织层级分页查询")
+    ResultBean<SysOrganizationVo> selectByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath){
+        return sysOrganizationService.selectByOrgSidPath(orgSidPath);
+    }
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysPostRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysPostRest.java
new file mode 100644
index 0000000..679d748
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysPostRest.java
@@ -0,0 +1,120 @@
+package com.yxt.wms.apiadmin.func;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.syspost.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPostFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.biz.syspost.SysPostRest <br/>
+ * Description: 岗位. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "岗位")
+@RestController
+@RequestMapping("apiadmin/syspost")
+public class SysPostRest {
+
+    @Autowired
+    private SysPostService sysPostService;
+
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysPostVo>> listPage(@RequestBody PagerQuery<SysPostQuery> pq) {
+        return sysPostService.listPageVo(pq);
+    }
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<SysPostVo>> listAll(@RequestBody SysPostQuery query){
+        return sysPostService.listAllVo(query);
+    }
+
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<SysPostVo>> list() {
+        return sysPostService.listVo();
+    }
+
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysPostDto dto){
+        return sysPostService.saveOrUpdateDto(dto);
+    }
+
+
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody SysPostDto dto, @PathVariable("sid") String sid){
+        return sysPostService.updateBySid(dto, sid);
+    }
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids){
+        return sysPostService.del(ids);
+    }
+
+
+    @ApiOperation("删除记录")
+    @GetMapping("/delBySids/{sids}")
+    public ResultBean delBySids(@PathVariable("sids") String sids){
+        return sysPostService.delBySids(sids);
+    }
+
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<SysPostVo> fetch(@PathVariable("id") String id){
+        return sysPostService.fetchByIdVo(id);
+    }
+
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<SysPostVo> fetchBySid(@PathVariable("sid") String sid){
+        return sysPostService.fetchBySidVo(sid);
+    }
+
+
+    @ApiOperation("根据部门sid获取岗位列表")
+    @GetMapping("/fetchByOrgSid/{orgSid}")
+    public ResultBean<List<SysPostVo>> fetchByOrgSid(@PathVariable("orgSid") String orgSid){
+        return sysPostService.fetchByOrgSid(orgSid);
+    }
+
+    @ApiOperation("根据部门sid获取岗位编号")
+    @GetMapping("/fetchByOrgSidPostCode/{orgSid}")
+    public ResultBean<String> fetchByOrgSidPostCode(){
+        return sysPostService.fetchByOrgSidPostCode();
+    }
+
+    /**
+     * 查询岗位列表
+     *
+     * @return
+     */
+    @ApiOperation("查询岗位列表")
+    @GetMapping("/selectList")
+    public ResultBean<List<SysPostListVo>> selectList() {
+        return sysPostService.selectList();
+    }
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysRoleRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysRoleRest.java
new file mode 100644
index 0000000..9db68e9
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysRoleRest.java
@@ -0,0 +1,117 @@
+package com.yxt.wms.apiadmin.func;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysrole.SysRoleDto;
+import com.yxt.wms.biz.func.sysrole.SysRoleQuery;
+import com.yxt.wms.biz.func.sysrole.SysRoleService;
+import com.yxt.wms.biz.func.sysrole.SysRoleVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysrole.SysRoleRest <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "角色")
+@RestController
+@RequestMapping("apiadmin/sysrole")
+public class SysRoleRest {
+
+	@Autowired
+	private SysRoleService sysRoleService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<SysRoleVo>> listPage(@RequestBody PagerQuery<SysRoleQuery> pq){
+		return sysRoleService.listPageVo(pq);
+	}
+
+
+	@ApiOperation("根据条件查询所有数据列表")
+	@PostMapping("/listAll")
+	public ResultBean<List<SysRoleVo>> listAll(@RequestBody SysRoleQuery query){
+		return sysRoleService.listAllVo(query);
+	}
+
+
+	@ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色")
+	@PostMapping("/listAllByUserSid/{userSid}")
+	public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid){
+		return sysRoleService.listAllByUserSid(userSid);
+	}
+
+
+	@ApiOperation("根据用户sid查询用户的角色列表")
+	@PostMapping("/fetchByUserSid/{userSid}")
+	public ResultBean<List<SysRoleVo>> fetchByUserSid(@PathVariable("userSid") String userSid){
+		return sysRoleService.fetchByUserSid(userSid);
+	}
+
+
+	public ResultBean<List<SysRoleVo>> list(){
+		return sysRoleService.listVo();
+	}
+
+
+	@ApiOperation("新增保存")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody SysRoleDto dto){
+		return sysRoleService.saveOrUpdateDto(dto);
+	}
+
+
+	@ApiOperation("修改保存")
+	@PostMapping("/update/{sid}")
+	public ResultBean update(@RequestBody SysRoleDto dto,@PathVariable("sid") String sid){
+		return sysRoleService.updateBySid(dto,sid);
+	}
+
+
+	@ApiOperation("删除记录")
+	@GetMapping("/del/{ids}")
+	public ResultBean del(@PathVariable("ids") String ids){
+		return sysRoleService.del(ids);
+	}
+
+	@ApiOperation("删除记录根据sids")
+	@GetMapping("/delBySids/{sids}")
+	public ResultBean delBySids(@PathVariable("sids") String sids){
+		return sysRoleService.delBySid(sids);
+	}
+
+	@ApiOperation("获取一条记录")
+	@GetMapping("/fetch/{id}")
+	public ResultBean<SysRoleVo> fetch(@PathVariable("id") String id){
+		return sysRoleService.fetchByIdVo(id);
+	}
+
+	@ApiOperation("获取一条记录根据sid")
+	@GetMapping("/fetchBySid/{sid}")
+	public ResultBean<SysRoleVo> fetchBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return sysRoleService.fetchBySidVo(sid);
+	}
+
+	@PostMapping("/setIsEnable/{sid}/{isEnable}")
+	@ResponseBody
+	@ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用")
+	public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){
+		return sysRoleService.updateIsEnable(sid, isEnable);
+	}
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/SysUserRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysUserRest.java
similarity index 66%
rename from wms-biz/src/main/java/com/yxt/wms/apiadmin/SysUserRest.java
rename to wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysUserRest.java
index acda6ef..8446b78 100644
--- a/wms-biz/src/main/java/com/yxt/wms/apiadmin/SysUserRest.java
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysUserRest.java
@@ -1,11 +1,12 @@
-package com.yxt.wms.apiadmin;
+package com.yxt.wms.apiadmin.func;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.wms.biz.sysuser.SysUserService;
-import com.yxt.wms.feign.user.sysuser.SysUserDto;
-import com.yxt.wms.feign.user.sysuser.SysUserQuery;
-import com.yxt.wms.feign.user.sysuser.SysUserVo;
+import com.yxt.wms.biz.func.sysuser.SysUserService;
+import com.yxt.wms.feign.portal.sysuser.SysUserDto;
+import com.yxt.wms.feign.portal.sysuser.SysUserQuery;
+import com.yxt.wms.feign.portal.sysuser.SysUserVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,15 +50,26 @@ public class SysUserRest {
     @PostMapping("/sendMessageCode")
     @ResponseBody
     @ApiOperation(value = "3、获取注册码")
-    @ApiOperationSupport(order = 30)
-    public ResultBean sendMessageCode(String mobile){
+    public ResultBean sendMessageCode(@RequestParam("mobile") String mobile){
         return sysUserService.sendMessageCode(mobile);
     }
     @PostMapping("/sendMessageLogin")
     @ResponseBody
     @ApiOperation(value = "3、获取登录码")
-    @ApiOperationSupport(order = 30)
-    public ResultBean sendMessageLogin(String mobile){
+    public ResultBean sendMessageLogin(@RequestParam("mobile") String mobile){
         return sysUserService.sendMessageLogin(mobile);
     }
+    @PostMapping("/sendMessageUpdate")
+    @ResponseBody
+    @ApiOperation(value = "3、获取修改码")
+    public ResultBean sendMessageUpdate(@RequestParam("mobile") String mobile){
+        return sysUserService.sendMessageUpdate(mobile);
+    }
+
+    @PostMapping("/listPage")
+    @ResponseBody
+
+    public ResultBean listPage(@RequestBody PagerQuery<SysUserQuery> pq){
+        return sysUserService.listPage(pq);
+    }
 }
diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysUserRoleRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysUserRoleRest.java
new file mode 100644
index 0000000..cbf1e1e
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysUserRoleRest.java
@@ -0,0 +1,104 @@
+package com.yxt.wms.apiadmin.func;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysuserrole.SysUserRoleDto;
+import com.yxt.wms.biz.func.sysuserrole.SysUserRoleQuery;
+import com.yxt.wms.biz.func.sysuserrole.SysUserRoleService;
+import com.yxt.wms.biz.func.sysuserrole.SysUserRoleVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserRoleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleRest <br/>
+ * Description: 用户与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "用户与角色关联表")
+@RestController
+@RequestMapping("apiadmin/sysuserrole")
+public class SysUserRoleRest {
+
+    @Autowired
+    private SysUserRoleService sysUserRoleService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysUserRoleVo>> listPage(@RequestBody PagerQuery<SysUserRoleQuery> pq){
+        return sysUserRoleService.listPageVo(pq);
+    }
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<SysUserRoleVo>> listAll(@RequestBody SysUserRoleQuery query){
+        return sysUserRoleService.listAllVo(query);
+    }
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<SysUserRoleVo>> list(){
+        return sysUserRoleService.listVo();
+    }
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysUserRoleDto dto){
+        return sysUserRoleService.saveOrUpdateDto(dto);
+    }
+
+    @ApiOperation("修改保存")
+    @PostMapping("/update")
+    public ResultBean update(@RequestBody SysUserRoleDto dto){
+        return sysUserRoleService.saveOrUpdate(dto);
+    }
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids){
+        return sysUserRoleService.del(ids);
+    }
+
+    @ApiOperation("根据用户sid和角色sid删除记录")
+    @GetMapping("/delByUserSidAndRoleSid/{userSid}/{roleSid}")
+    public ResultBean delByUserSidAndRoleSid(@PathVariable("userSid")String userSid,
+                                             @PathVariable("roleSid")String roleSid) {
+        return sysUserRoleService.delByUserSidAndRoleSid(userSid,roleSid);
+    }
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<SysUserRoleVo> fetch(@PathVariable("id") String id){
+        return sysUserRoleService.fetchByIdVo(id);
+    }
+
+    @ApiOperation("根据用户sid查询用户角色sid列表")
+    @GetMapping("/getUserRoleSidByUserSid/{userSid}")
+    public ResultBean<List<String>> getUserRoleSidByUserSid(@PathVariable("userSid") String userSid) {
+        return sysUserRoleService.getUserRoleSidByUserSid(userSid);
+    }
+
+    @ApiOperation("根据角色sid查询用户id列表")
+    @GetMapping("/getUserIdListByRoleSid")
+    public ResultBean<List<String>> getUserIdListByRoleSid(@RequestParam("roleList") List<String> roleList) {
+        return sysUserRoleService.getUserIdListByRoleSid(roleList);
+    }
+
+    @ApiOperation("查询用户的角色")
+    @GetMapping("/selectByUserSid")
+    ResultBean<List<String>> selectByUserSid(@RequestParam("userSid") String userSid) {
+        return sysUserRoleService.selectByUserSids(userSid);
+    }
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfo.java
similarity index 91%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfo.java
index 9f189b5..f9ba4b9 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfo.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basebrandinfo;
+package com.yxt.wms.biz.func.basebrandinfo;
 
 import com.yxt.common.core.domain.BaseEntity;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoDto.java
similarity index 94%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoDto.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoDto.java
index 4f4bf9c..01633be 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoDto.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoDto.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basebrandinfo;
+package com.yxt.wms.biz.func.basebrandinfo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoMapper.java
similarity index 93%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoMapper.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoMapper.java
index 345f3df..c3a5c61 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoMapper.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoMapper.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basebrandinfo;
+package com.yxt.wms.biz.func.basebrandinfo;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoMapper.xml
similarity index 67%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoMapper.xml
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoMapper.xml
index 69caf0b..cbd994b 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoMapper.xml
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.basebrandinfo.BaseBrandInfoMapper">
+<mapper namespace="com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basebrandinfo.BaseBrandInfoVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoVo">
         select
             *
         from base_brand_info
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoQuery.java
similarity index 82%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoQuery.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoQuery.java
index 3560f94..bd2b71c 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basebrandinfo;
+package com.yxt.wms.biz.func.basebrandinfo;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoService.java
similarity index 97%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoService.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoService.java
index d5c598b..06da915 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoService.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoService.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basebrandinfo;
+package com.yxt.wms.biz.func.basebrandinfo;
 
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoVo.java
similarity index 95%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoVo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoVo.java
index ef50521..50f55f2 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoVo.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basebrandinfo;
+package com.yxt.wms.biz.func.basebrandinfo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSku.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSku.java
similarity index 94%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSku.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSku.java
index 3349911..235c412 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSku.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSku.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yxt.common.core.domain.BaseEntity;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuDetailsVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuDetailsVo.java
similarity index 97%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuDetailsVo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuDetailsVo.java
index 2de04e4..9db372e 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuDetailsVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuDetailsVo.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuDto.java
similarity index 90%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuDto.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuDto.java
index 194b5c8..7308e14 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuDto.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuDto.java
@@ -1,9 +1,9 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
-import com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtendDto;
+import com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendDto;
 import lombok.Data;
 
 import java.util.Date;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuMapper.java
similarity index 95%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuMapper.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuMapper.java
index abe2194..f2fa0b7 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuMapper.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuMapper.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuMapper.xml
similarity index 74%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuMapper.xml
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuMapper.xml
index 5c42027..7184dc1 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuMapper.xml
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.basegoodssku.BaseGoodsSkuMapper">
+<mapper namespace="com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basegoodssku.BaseGoodsSkuVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo">
         select s.*,s.own_spec as ownSpec,a.goodsName
         from base_goods_sku s
             left join base_goods_spu a on a.sid=s.goodsSpuSid
@@ -12,20 +12,20 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="getSkusBySpuSid" resultType="com.yxt.wms.biz.basegoodssku.BaseGoodsSkuVo">
+    <select id="getSkusBySpuSid" resultType="com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo">
         select s.*,
                s.own_spec as ownSpec
         from base_goods_sku s
         where s.goodsSpuSid = #{spuSid}
     </select>
-    <select id="getSkuBySid" resultType="com.yxt.wms.biz.basegoodssku.BaseGoodsSkuVo">
+    <select id="getSkuBySid" resultType="com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo">
         select *,
                s.own_spec as ownSpec
         from base_goods_sku s
         where s.sid = #{sid}
     </select>
 
-    <select id="getSelectList" resultType="com.yxt.wms.biz.basegoodssku.BaseGoodsSkuSelectList">
+    <select id="getSelectList" resultType="com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuSelectList">
         select sku.sid       goodsSkuSid,
                spu.sid   as  goodsSpuSid,
                spu.goodsName goodsSpuName,
@@ -40,7 +40,7 @@
         </where>
     </select>
 
-    <select id="purGoodsListPage" resultType="com.yxt.wms.biz.basegoodssku.BaseGoodsSkuPurSelectList">
+    <select id="purGoodsListPage" resultType="com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuPurSelectList">
         SELECT
         s.sid,
         s.goodsSkuCode,
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuPurSelectList.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuPurSelectList.java
similarity index 94%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuPurSelectList.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuPurSelectList.java
index 4d2e3dd..e704132 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuPurSelectList.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuPurSelectList.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import lombok.Data;
 
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuPurSelectQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuPurSelectQuery.java
similarity index 93%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuPurSelectQuery.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuPurSelectQuery.java
index e10752a..bd19c23 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuPurSelectQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuPurSelectQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuQuery.java
similarity index 82%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuQuery.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuQuery.java
index 62ea151..05f4fa4 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuSelectList.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuSelectList.java
similarity index 93%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuSelectList.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuSelectList.java
index 85008ef..7dd850d 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuSelectList.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuSelectList.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import lombok.Data;
 
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuSelectQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuSelectQuery.java
similarity index 84%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuSelectQuery.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuSelectQuery.java
index 42b48c1..6177761 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuSelectQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuSelectQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuService.java
similarity index 99%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuService.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuService.java
index 870273c..9a443cb 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuService.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuService.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuVo.java
similarity index 92%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuVo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuVo.java
index 42d99f5..9c941ce 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuVo.java
@@ -1,9 +1,9 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
-import com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtendVo;
+import com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendVo;
 import lombok.Data;
 
 import java.util.Date;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtend.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtend.java
similarity index 96%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtend.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtend.java
index 644c74e..cb2a1d1 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtend.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtend.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsskuextend;
+package com.yxt.wms.biz.func.basegoodsskuextend;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yxt.common.core.domain.BaseEntity;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendDto.java
similarity index 97%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendDto.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendDto.java
index 8a9c7a4..b7a883d 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendDto.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendDto.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsskuextend;
+package com.yxt.wms.biz.func.basegoodsskuextend;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.java
similarity index 93%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendMapper.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.java
index 0595b55..e0fac58 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendMapper.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsskuextend;
+package com.yxt.wms.biz.func.basegoodsskuextend;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml
similarity index 68%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml
index c6c850e..a445721 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtendMapper">
+<mapper namespace="com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtendVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendVo">
         select
             s.*,a.title
         from base_goods_sku_extend s
@@ -13,13 +13,13 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="getExtendBySkuSid" resultType="com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtendVo">
+    <select id="getExtendBySkuSid" resultType="com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendVo">
         select
         s.*,s.InventoryAlertUpperLimit as inventoryAlertUpperLimit,s.InventoryAlertLowerLimit as inventoryAlertLowerLimit
         from base_goods_sku_extend s
         where s.goodsSkuSid=#{skuSid}
     </select>
-    <select id="getExtendBySid" resultType="com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtendVo">
+    <select id="getExtendBySid" resultType="com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendVo">
         select
             s.*,s.InventoryAlertUpperLimit as inventoryAlertUpperLimit,s.InventoryAlertLowerLimit as inventoryAlertLowerLimit
         from base_goods_sku_extend s
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendQuery.java
similarity index 80%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendQuery.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendQuery.java
index ea4c804..4003ad7 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsskuextend;
+package com.yxt.wms.biz.func.basegoodsskuextend;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendService.java
similarity index 99%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendService.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendService.java
index 514bf70..dc31121 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendService.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendService.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsskuextend;
+package com.yxt.wms.biz.func.basegoodsskuextend;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendVo.java
similarity index 97%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendVo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendVo.java
index 52d2684..b1eeda8 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendVo.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsskuextend;
+package com.yxt.wms.biz.func.basegoodsskuextend;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/UrlsVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/UrlsVo.java
similarity index 72%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/UrlsVo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/UrlsVo.java
index 57c5973..b7b9f3c 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/UrlsVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/UrlsVo.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsskuextend;
+package com.yxt.wms.biz.func.basegoodsskuextend;
 
 import lombok.Data;
 
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpu.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpu.java
similarity index 96%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpu.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpu.java
index 3716437..478587c 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpu.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpu.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspu;
+package com.yxt.wms.biz.func.basegoodsspu;
 
 import com.yxt.common.core.domain.BaseEntity;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuDto.java
similarity index 89%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuDto.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuDto.java
index 01e5e96..05b95fd 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuDto.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuDto.java
@@ -1,9 +1,9 @@
-package com.yxt.wms.biz.basegoodsspu;
+package com.yxt.wms.biz.func.basegoodsspu;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
-import com.yxt.wms.biz.basegoodssku.BaseGoodsSkuDto;
-import com.yxt.wms.biz.basegoodsspudetail.BaseGoodsSpuDetailDto;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuDto;
+import com.yxt.wms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailDto;
 import lombok.Data;
 
 import java.util.Date;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuMapper.java
similarity index 93%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuMapper.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuMapper.java
index 89ae924..2eded63 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuMapper.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuMapper.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspu;
+package com.yxt.wms.biz.func.basegoodsspu;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuMapper.xml
similarity index 79%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuMapper.xml
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuMapper.xml
index 4280837..c54d6f3 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuMapper.xml
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuMapper">
+<mapper namespace="com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo">
         select
             s.*,a.goodsTypeName as typeName,b.brandName as brandName,c.manufacturerName as manufacturerName
         from base_goods_spu s
@@ -15,7 +15,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="initialization" resultType="com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuVo">
+    <select id="initialization" resultType="com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo">
         select
         s.*,a.goodsTypeName as typeName,b.brandName as brandName,c.manufacturerName as manufacturerName
         from base_goods_spu s
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuQuery.java
similarity index 82%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuQuery.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuQuery.java
index 208a758..536aaf5 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspu;
+package com.yxt.wms.biz.func.basegoodsspu;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuService.java
similarity index 96%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuService.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuService.java
index 2df77e1..d97b99d 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuService.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuService.java
@@ -1,21 +1,17 @@
-package com.yxt.wms.biz.basegoodsspu;
+package com.yxt.wms.biz.func.basegoodsspu;
 
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.apiadmin.BaseGoodsBrandRest;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfo;
-import com.yxt.wms.biz.basegoodssku.BaseGoodsSku;
-import com.yxt.wms.biz.basegoodssku.BaseGoodsSkuDto;
-import com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtend;
-import com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtendDto;
-import com.yxt.wms.biz.basegoodsspudetail.BaseGoodsSpuDetail;
-import com.yxt.wms.biz.basegoodsspudetail.BaseGoodsSpuDetailDto;
-import com.yxt.wms.biz.basegoodstype.BaseGoodsType;
-import com.yxt.wms.biz.basegoodsunit.BaseGoodsUnit;
-import com.yxt.wms.biz.basemanufacturer.BaseManufacturer;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfo;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuDto;
+import com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendDto;
+import com.yxt.wms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailDto;
+import com.yxt.wms.biz.func.basegoodstype.BaseGoodsType;
+import com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnit;
+import com.yxt.wms.biz.func.basemanufacturer.BaseManufacturer;
 import com.yxt.wms.feign.base.basebrandinfo.BaseBrandInfoFeign;
 import com.yxt.wms.feign.base.basegoodsspu.*;
 import com.yxt.wms.feign.base.basegoodstype.BaseGoodsTypeFeign;
@@ -24,7 +20,6 @@ import com.yxt.wms.feign.base.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.wms.utils.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -32,7 +27,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuVo.java
similarity index 90%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuVo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuVo.java
index 89ccda3..8da4f34 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuVo.java
@@ -1,9 +1,9 @@
-package com.yxt.wms.biz.basegoodsspu;
+package com.yxt.wms.biz.func.basegoodsspu;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
-import com.yxt.wms.biz.basegoodssku.BaseGoodsSkuVo;
-import com.yxt.wms.biz.basegoodsspudetail.BaseGoodsSpuDetailVo;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
+import com.yxt.wms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailVo;
 import lombok.Data;
 
 import java.util.Date;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetail.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetail.java
similarity index 93%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetail.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetail.java
index d261b14..7297044 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetail.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetail.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspudetail;
+package com.yxt.wms.biz.func.basegoodsspudetail;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yxt.common.core.domain.BaseEntity;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailDto.java
similarity index 95%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailDto.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailDto.java
index ab3e0b3..e161b3f 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailDto.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailDto.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspudetail;
+package com.yxt.wms.biz.func.basegoodsspudetail;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.java
similarity index 93%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailMapper.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.java
index 9ed3a97..9201665 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailMapper.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspudetail;
+package com.yxt.wms.biz.func.basegoodsspudetail;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml
similarity index 73%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml
index f68f271..1369224 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.basegoodsspudetail.BaseGoodsSpuDetailMapper">
+<mapper namespace="com.yxt.wms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basegoodsspudetail.BaseGoodsSpuDetailVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailVo">
         select
             s.*,a.goodsName
         from base_goods_spu_detail s
@@ -14,7 +14,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="getSpuDetailsBySpuSid" resultType="com.yxt.wms.biz.basegoodsspudetail.BaseGoodsSpuDetailVo">
+    <select id="getSpuDetailsBySpuSid" resultType="com.yxt.wms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailVo">
         select
         s.*,s.generic_spec as genericSpec,s.special_spec as specialSpec
         from base_goods_spu_detail s
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailQuery.java
similarity index 80%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailQuery.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailQuery.java
index 1e4b4bd..bd6a75b 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspudetail;
+package com.yxt.wms.biz.func.basegoodsspudetail;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailService.java
similarity index 98%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailService.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailService.java
index 82e70f6..ed487b3 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailService.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailService.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspudetail;
+package com.yxt.wms.biz.func.basegoodsspudetail;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailVo.java
similarity index 96%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailVo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailVo.java
index f4d5721..613e9dd 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailVo.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspudetail;
+package com.yxt.wms.biz.func.basegoodsspudetail;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsType.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsType.java
similarity index 94%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsType.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsType.java
index 10c5745..e07ec46 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsType.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsType.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodstype;
+package com.yxt.wms.biz.func.basegoodstype;
 
 import com.yxt.common.core.domain.BaseEntity;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeDto.java
similarity index 95%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeDto.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeDto.java
index d5c7e7f..717d347 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeDto.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeDto.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodstype;
+package com.yxt.wms.biz.func.basegoodstype;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeMapper.java
similarity index 93%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeMapper.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeMapper.java
index 3f6e54e..4cdcca6 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeMapper.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeMapper.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodstype;
+package com.yxt.wms.biz.func.basegoodstype;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeMapper.xml
similarity index 67%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeMapper.xml
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeMapper.xml
index 63031e3..61f57f5 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeMapper.xml
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.basegoodstype.BaseGoodsTypeMapper">
+<mapper namespace="com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basegoodstype.BaseGoodsTypeVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeVo">
         select
         *
         from base_goods_type
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeQuery.java
similarity index 82%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeQuery.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeQuery.java
index 06cc3f7..f1928a0 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodstype;
+package com.yxt.wms.biz.func.basegoodstype;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeService.java
similarity index 97%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeService.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeService.java
index 992d8dd..a0e9466 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeService.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeService.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodstype;
+package com.yxt.wms.biz.func.basegoodstype;
 
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeVo.java
similarity index 96%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeVo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeVo.java
index 16d2013..e4ae018 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeVo.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodstype;
+package com.yxt.wms.biz.func.basegoodstype;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnit.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnit.java
similarity index 83%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnit.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnit.java
index 1e6a937..29de774 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnit.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnit.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsunit;
+package com.yxt.wms.biz.func.basegoodsunit;
 
 import com.yxt.common.core.domain.BaseEntity;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitDto.java
similarity index 93%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitDto.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitDto.java
index 4217006..b83c962 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitDto.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitDto.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsunit;
+package com.yxt.wms.biz.func.basegoodsunit;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitMapper.java
similarity index 93%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitMapper.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitMapper.java
index b1c57c7..242f58e 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitMapper.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitMapper.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsunit;
+package com.yxt.wms.biz.func.basegoodsunit;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitMapper.xml
similarity index 67%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitMapper.xml
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitMapper.xml
index e971a54..dd33803 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitMapper.xml
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.basegoodsunit.BaseGoodsUnitMapper">
+<mapper namespace="com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnitMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basegoodsunit.BaseGoodsUnitVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnitVo">
         select
         *
         from base_goods_unit
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitQuery.java
similarity index 82%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitQuery.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitQuery.java
index bdd0706..c90113c 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsunit;
+package com.yxt.wms.biz.func.basegoodsunit;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitService.java
similarity index 97%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitService.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitService.java
index 52d1939..ab87e3c 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitService.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitService.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsunit;
+package com.yxt.wms.biz.func.basegoodsunit;
 
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitVo.java
similarity index 93%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitVo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitVo.java
index 72a630a..f3aba96 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitVo.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsunit;
+package com.yxt.wms.biz.func.basegoodsunit;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturer.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturer.java
similarity index 91%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturer.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturer.java
index c9c1ce3..49bfd8b 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturer.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturer.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basemanufacturer;
+package com.yxt.wms.biz.func.basemanufacturer;
 
 import com.yxt.common.core.domain.BaseEntity;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerDto.java
similarity index 95%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerDto.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerDto.java
index 504cf1d..1088c62 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerDto.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerDto.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basemanufacturer;
+package com.yxt.wms.biz.func.basemanufacturer;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerMapper.java
similarity index 93%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerMapper.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerMapper.java
index ba84219..39b0e9c 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerMapper.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerMapper.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basemanufacturer;
+package com.yxt.wms.biz.func.basemanufacturer;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerMapper.xml
similarity index 69%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerMapper.xml
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerMapper.xml
index 30ac8a3..b319b5e 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerMapper.xml
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.basemanufacturer.BaseManufacturerMapper">
+<mapper namespace="com.yxt.wms.biz.func.basemanufacturer.BaseManufacturerMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basemanufacturer.BaseManufacturerVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basemanufacturer.BaseManufacturerVo">
         select
         *
         from base_manufacturer
@@ -12,7 +12,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="getAllTypeByUseOrgSid" resultType="com.yxt.wms.biz.basemanufacturer.BaseManufacturerVo">
+    <select id="getAllTypeByUseOrgSid" resultType="com.yxt.wms.biz.func.basemanufacturer.BaseManufacturerVo">
         select *
         from base_manufacturer
         where useOrgSid = #{useOrgSid}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerQuery.java
similarity index 81%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerQuery.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerQuery.java
index 7fda0bc..00386e6 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basemanufacturer;
+package com.yxt.wms.biz.func.basemanufacturer;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerService.java
similarity index 97%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerService.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerService.java
index 5c45b6e..dbd50f5 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerService.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerService.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basemanufacturer;
+package com.yxt.wms.biz.func.basemanufacturer;
 
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerVo.java
similarity index 95%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerVo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerVo.java
index df231f9..d57eb26 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerVo.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basemanufacturer;
+package com.yxt.wms.biz.func.basemanufacturer;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBank.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBank.java
similarity index 98%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBank.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBank.java
index a7b92fe..cdac86b 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBank.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBank.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierBank;
+package com.yxt.wms.biz.func.basesupplierBank;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankDetailsVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDetailsVo.java
similarity index 98%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankDetailsVo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDetailsVo.java
index adfb71b..d220942 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankDetailsVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDetailsVo.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierBank;
+package com.yxt.wms.biz.func.basesupplierBank;
 
 
 import com.yxt.common.core.vo.Vo;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDto.java
similarity index 98%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankDto.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDto.java
index be0b24a..38d8fb7 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankDto.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDto.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierBank;
+package com.yxt.wms.biz.func.basesupplierBank;
 
 
 import com.yxt.common.core.dto.Dto;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.java
similarity index 98%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankMapper.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.java
index 8911bc7..d9d9e27 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankMapper.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierBank;
+package com.yxt.wms.biz.func.basesupplierBank;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.xml
similarity index 57%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankMapper.xml
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.xml
index 2648c13..cd0de0a 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankMapper.xml
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.basesupplierBank.BaseSupplierBankMapper">
+<mapper namespace="com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.wms.biz.basesupplierBank.BaseSupplierBankVo">
+	<select id="selectPageVo" resultType="com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankVo">
 		SELECT * FROM base_supplier_bank <where> ${ew.sqlSegment} </where>
 	</select>
 	
-	<select id="selectListAllVo" resultType="com.yxt.wms.biz.basesupplierBank.BaseSupplierBankVo">
+	<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankVo">
 		SELECT * FROM base_supplier_bank <where> ${ew.sqlSegment} </where>
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankQuery.java
similarity index 98%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankQuery.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankQuery.java
index d41910d..7c3c71e 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankQuery.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierBank;
+package com.yxt.wms.biz.func.basesupplierBank;
 
 
 import com.yxt.common.core.query.Query;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankService.java
similarity index 98%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankService.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankService.java
index edfb5d1..8cdc74a 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankService.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankService.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierBank;
+package com.yxt.wms.biz.func.basesupplierBank;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankVo.java
similarity index 98%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankVo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankVo.java
index 016078c..2141c91 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankVo.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierBank;
+package com.yxt.wms.biz.func.basesupplierBank;
 
 
 import com.yxt.common.core.vo.Vo;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfo.java
similarity index 98%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfo.java
index b1d1fbe..fd67ada 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfo.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoChoice.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoChoice.java
similarity index 97%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoChoice.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoChoice.java
index a99c592..6ea8b82 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoChoice.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoChoice.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
 
 import com.yxt.common.core.vo.Vo;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoDetailsVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDetailsVo.java
similarity index 97%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoDetailsVo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDetailsVo.java
index 690adf5..850879c 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoDetailsVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDetailsVo.java
@@ -23,11 +23,11 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
 
 import com.yxt.common.core.vo.Vo;
-import com.yxt.wms.biz.basesupplierBank.BaseSupplierBankDetailsVo;
+import com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankDetailsVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDto.java
similarity index 97%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoDto.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDto.java
index e79b240..4cddb64 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoDto.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDto.java
@@ -23,11 +23,11 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
 
 import com.yxt.common.core.dto.Dto;
-import com.yxt.wms.biz.basesupplierBank.BaseSupplierBankDto;
+import com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.java
similarity index 98%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoMapper.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.java
index 4ce1054..a9d114a 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoMapper.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.xml
similarity index 57%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoMapper.xml
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.xml
index f47299d..90efe5d 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoMapper.xml
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.basesupplierinfo.BaseSupplierInfoMapper">
+<mapper namespace="com.yxt.wms.biz.func.basesupplierinfo.BaseSupplierInfoMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.wms.biz.basesupplierinfo.BaseSupplierInfoVo">
+	<select id="selectPageVo" resultType="com.yxt.wms.biz.func.basesupplierinfo.BaseSupplierInfoVo">
 		SELECT * FROM base_supplier_info <where> ${ew.sqlSegment} </where>
 	</select>
 	
-	<select id="selectListAllVo" resultType="com.yxt.wms.biz.basesupplierinfo.BaseSupplierInfoVo">
+	<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.basesupplierinfo.BaseSupplierInfoVo">
 		SELECT * FROM base_supplier_info <where> ${ew.sqlSegment} </where>
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoQuery.java
similarity index 98%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoQuery.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoQuery.java
index a6eae2f..4491bc3 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoQuery.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
 
 import com.yxt.common.core.query.Query;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoService.java
similarity index 92%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoService.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoService.java
index 484434a..9e85f8f 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoService.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoService.java
@@ -23,18 +23,13 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
-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.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.feign.base.basesupplierinfo.BaseSupplierInfoFeign;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoVo.java
similarity index 98%
rename from wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoVo.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoVo.java
index 9680e7a..516494c 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoVo.java
@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
 
 import com.yxt.common.core.vo.Vo;
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommon.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommon.java
new file mode 100644
index 0000000..1489a30
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommon.java
@@ -0,0 +1,25 @@
+package com.yxt.wms.biz.func.dictcommon;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:40
+ * @description 数据字典数据项
+ */
+@Data
+public class DictCommon extends BaseEntity {
+    private static final long serialVersionUID = 8921237815183601526L;
+    @ApiModelProperty(value = "数据项值")
+    private String dictKey;
+    @ApiModelProperty(value = "数据类型")
+    private String dictType;
+    @ApiModelProperty(value = "数据项相对应的value值")
+    private String dictValue;
+    @ApiModelProperty(value = "数据项的父级sid")
+    private String parentSid;
+    @ApiModelProperty(value = "分组名称")
+    private String groupName;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonDto.java
new file mode 100644
index 0000000..81a592b
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonDto.java
@@ -0,0 +1,36 @@
+package com.yxt.wms.biz.func.dictcommon;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:41
+ * @description 数据字典数据项参数
+ */
+@Data
+public class DictCommonDto implements Dto {
+    private static final long serialVersionUID = 9102264215113210976L;
+
+    @ApiModelProperty(value = "数据项值", required = true)
+    @NotBlank(message = "数据项值不能为空")
+    private String dictKey;
+
+    @ApiModelProperty(value = "数据类型", required = true)
+    @NotBlank(message = "数据类型不能为空")
+    private String dictType;
+
+    @ApiModelProperty(value = "数据项相对应的value值", required = true)
+    @NotBlank(message = "数据项相对应的value值不能为空")
+    private String dictValue;
+
+    @ApiModelProperty(value = "数据项的父级sid", required = true)
+    @NotBlank(message = "数据项的父级sid不能为空")
+    private String parentSid;
+
+    @ApiModelProperty(value = "分组名称", required = true)
+    private String groupName;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonMapper.java
new file mode 100644
index 0000000..e61ecf5
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonMapper.java
@@ -0,0 +1,60 @@
+package com.yxt.wms.biz.func.dictcommon;
+
+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 org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:07
+ * @description
+ */
+@Mapper
+public interface DictCommonMapper extends BaseMapper<DictCommon> {
+    /**
+     * 根据数据项的key值和分类类型code值查询数量
+     *
+     * @param dictKey   数据项key值
+     * @param dictType  类型code值
+     * @param parentSid 父级sid，无父级的此字段为0
+     * @return
+     */
+    DictCommon selectSize(@Param("dictkey") String dictKey, @Param("dictType") String dictType, @Param("parentSid") String parentSid);
+
+
+    /**
+     * 根据类型查询数据项
+     *
+     * @param dictTypeCode 数据分类的类型
+     * @return
+     */
+    List<DictCommon> selectByType(String dictTypeCode);
+
+
+    IPage<DictCommonVo> pageList(
+            IPage<DictCommonQuery> page, @Param(Constants.WRAPPER) Wrapper<DictCommonVo> qw);
+
+    DictCommonVo selectBykey(@Param("key") String key, @Param("type") String sid);
+
+    /**
+     * 根据类型和父级sid查询数据字典
+     *
+     * @param qw 查询条件
+     * @return
+     */
+    List<DictCommonVo> getValue(@Param(Constants.WRAPPER) QueryWrapper<DictCommonVo> qw);
+
+    /**
+     * 根据数据字典编码类别和分组查询数据字典
+     * @param type 数据字典编码类别
+     * @param groupNum 数据字典分组
+     * @return
+     */
+    List<DictCommonVo> getList(@Param("type") String type, @Param("groupNum") String groupNum);
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonMapper.xml
new file mode 100644
index 0000000..4d81e13
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonMapper.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.dictcommon.DictCommonMapper">
+    <select id="selectSize" resultType="com.yxt.wms.biz.func.dictcommon.DictCommon">
+        SELECT *
+        FROM dict_common
+        WHERE dictKey = #{dictkey}
+          AND dictType = #{dictType}
+          AND parentSid = #{parentSid}
+    </select>
+
+    <select id="selectByType" resultType="com.yxt.wms.biz.func.dictcommon.DictCommon">
+        SELECT *
+        FROM dict_common
+        WHERE dictType = #{dictTypeCode}
+    </select>
+
+    <select id="pageList" resultType="com.yxt.wms.biz.func.dictcommon.DictCommonVo">
+        SELECT dc.dictValue, dc.dictType, dc.dictKey, dc.sid, dc.parentSid,dc.groupName
+        FROM dict_common dc
+                ${ew.customSqlSegment}
+    </select>
+    <!--获取下拉框-->
+    <select id="getValue" resultType="com.yxt.wms.biz.func.dictcommon.DictCommonVo">
+        SELECT dc.sid, dc.dictType, dc.dictKey, dc.dictValue, dc.parentSid
+        FROM dict_common dc ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectBykey" resultType="com.yxt.wms.biz.func.dictcommon.DictCommonVo">
+        SELECT sid,
+               dictKey,
+               dictType,
+               dictValue,
+               groupName
+        FROM dict_common
+        WHERE dictType = #{type}
+          AND dictkey = #{key}
+    </select>
+
+    <select id="getList" resultType="com.yxt.wms.biz.func.dictcommon.DictCommonVo">
+        select * from dict_common dc where dc.dictType = #{type} and find_in_set(#{groupNum}, replace(dc.groupName, ',', ','));
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonQuery.java
new file mode 100644
index 0000000..4196748
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonQuery.java
@@ -0,0 +1,24 @@
+package com.yxt.wms.biz.func.dictcommon;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/28 10:39
+ * @description
+ */
+@Data
+public class DictCommonQuery implements Query {
+    private static final long serialVersionUID = -787372981183812826L;
+
+    @ApiModelProperty(value = "数据字典条目key", required = false)
+    private String dictKey;
+   
+    @ApiModelProperty(value = "数据字典文本", required = false)
+    private String dictValue;
+
+    @ApiModelProperty(value ="dictType")
+    private String dictType;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonService.java
new file mode 100644
index 0000000..68f26cf
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonService.java
@@ -0,0 +1,65 @@
+package com.yxt.wms.biz.func.dictcommon;
+
+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.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.feign.portal.dictcommon.DictCommonFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:06
+ * @description
+ */
+@Service
+public class DictCommonService extends MybatisBaseService<DictCommonMapper, DictCommon> {
+
+    @Autowired
+    DictCommonFeign dictCommonFeign;
+
+    public ResultBean save(DictCommonDto dictCommonDto) {
+        return dictCommonFeign.save(dictCommonDto);
+    }
+    public ResultBean updateBySid(DictCommonDto dictCommonDto,String sid ) {
+        return dictCommonFeign.update(dictCommonDto,sid );
+    }
+    public ResultBean del(String sid ) {
+        return dictCommonFeign.delete(sid );
+    }
+
+    public List<DictCommon> selectByType(String dictTypeCode) {
+        return baseMapper.selectByType(dictTypeCode);
+    }
+
+    public ResultBean<PagerVo<DictCommonVo>> pageList(PagerQuery<DictCommonQuery> pagerQuery) {
+        return dictCommonFeign.pageList(pagerQuery);
+    }
+
+    /**
+     * 根据类型和父级sid查询数据字典
+     *
+     * @param  查询条件
+     * @return
+     */
+    public ResultBean<List<DictCommonVo>> getValue(String type,String psid) {
+
+        return dictCommonFeign.getTypeValues(type, psid);
+    }
+
+    public ResultBean<DictCommonVo> selectBykey(String key, String type) {
+        return dictCommonFeign.selectBykey(key, type);
+    }
+
+    public ResultBean<List<DictCommonVo>> getList(String type, String groupNum) {
+        return  dictCommonFeign.getTypeValueList(type,groupNum);
+    }
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonTypeQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonTypeQuery.java
new file mode 100644
index 0000000..382e445
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonTypeQuery.java
@@ -0,0 +1,21 @@
+package com.yxt.wms.biz.func.dictcommon;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/9/30 15:33
+ * @description 下拉框条件
+ */
+@Data
+public class DictCommonTypeQuery implements Query {
+    private static final long serialVersionUID = 139959085226402464L;
+
+    @ApiModelProperty(value = "数据字典类型", required = true)
+    private String type;
+
+    @ApiModelProperty(value = "psid", required = false,example = "0")
+    private String psid;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonVo.java
new file mode 100644
index 0000000..94cb913
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonVo.java
@@ -0,0 +1,32 @@
+package com.yxt.wms.biz.func.dictcommon;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:54
+ * @description
+ */
+@Data
+public class DictCommonVo implements Vo {
+    private static final long serialVersionUID = -1094142938193916816L;
+
+    @ApiModelProperty(value = "数据字典项sid")
+    private String sid;
+
+    @ApiModelProperty(value = "数据字典项key")
+    private String dictKey;
+
+    @ApiModelProperty(value = "数据字典类型")
+    private String dictType;
+
+    @ApiModelProperty(value = "数据字典项名称")
+    private String dictValue;
+    @ApiModelProperty(value = "父级sid：0为第一级")
+    private String parentSid;
+
+    @ApiModelProperty(value = "分组名称")
+    private String groupName;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictType.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictType.java
new file mode 100644
index 0000000..3f004cd
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictType.java
@@ -0,0 +1,21 @@
+package com.yxt.wms.biz.func.dicttype;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/5 22:29
+ * @description
+ */
+@Data
+public class DictType extends BaseEntity {
+
+    private static final long serialVersionUID = -2790449398289680139L;
+
+    @ApiModelProperty(value = "类型代码")
+    private String dictTypeCode;
+    @ApiModelProperty(value = "类型名称")
+    private String dictTypeName;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeDto.java
new file mode 100644
index 0000000..dc23eb0
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeDto.java
@@ -0,0 +1,30 @@
+package com.yxt.wms.biz.func.dicttype;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:20
+ * @description 数据字典类型参数
+ */
+@Data
+public class DictTypeDto implements Dto {
+    private static final long serialVersionUID = -2302005624272862359L;
+
+    @ApiModelProperty(value = "类型代码", required = true)
+    @NotBlank(message = "类型代码不能为空")
+    private String dictTypeCode;
+
+    @ApiModelProperty(value = "类型名称", required = true)
+    @NotBlank(message = "类型名称不能为空")
+    private String dictTypeName;
+
+    @ApiModelProperty(value = "类型说明", required = false)
+    private String remarks;
+
+
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeMapper.java
new file mode 100644
index 0000000..986da14
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeMapper.java
@@ -0,0 +1,28 @@
+package com.yxt.wms.biz.func.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;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 14:56
+ * @description
+ */
+@Mapper
+public interface DictTypeMapper extends BaseMapper<DictType> {
+
+    /**
+     * 查询该类型代码存在的数量
+     *
+     * @param dictTypeCode 类型代码
+     * @return
+     */
+    int selectSize(String dictTypeCode);
+
+    IPage<DictTypeVo> pageList(IPage<?> page, @Param(Constants.WRAPPER) Wrapper<DictTypeVo> qw);
+
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeMapper.xml
new file mode 100644
index 0000000..d6e07bb
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.dicttype.DictTypeMapper">
+
+    <select id="selectSize" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM dict_type
+        WHERE dictTypeCode = #{dictTypeCode}
+    </select>
+
+    <select id="pageList" resultType="com.yxt.wms.biz.func.dicttype.DictTypeVo">
+        SELECT dt.dictTypeCode, dt.dictTypeName, dt.sid, dt.remarks
+        FROM dict_type dt
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeQuery.java
new file mode 100644
index 0000000..6f35c5c
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeQuery.java
@@ -0,0 +1,24 @@
+package com.yxt.wms.biz.func.dicttype;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/28 9:17
+ * @description
+ */
+@Data
+public class DictTypeQuery implements Query {
+    private static final long serialVersionUID = -1033205660448956012L;
+
+    @ApiModelProperty(value = "数据字典code", required = false)
+    private String dictTypeCode;
+
+    @ApiModelProperty(value = "数据分类名称", required = false)
+    private String dictTypeName;
+
+    @ApiModelProperty(value = "说明", required = false)
+    private String remarks;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeService.java
new file mode 100644
index 0000000..59fb5d0
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeService.java
@@ -0,0 +1,39 @@
+package com.yxt.wms.biz.func.dicttype;
+
+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.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.feign.portal.dicttype.DictTypeFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 14:55
+ * @description 数据字典类型实现类
+ */
+@Service
+public class DictTypeService extends MybatisBaseService<DictTypeMapper, DictType> {
+     @Autowired
+    DictTypeFeign dictTypeFeign;
+
+
+    public ResultBean save(DictTypeDto dictTypeDto) {
+        return dictTypeFeign.save(dictTypeDto);
+    }
+    public ResultBean updateBySid(DictTypeDto dictTypeDto,String sid ) {
+        return dictTypeFeign.update(dictTypeDto,sid);
+    }
+    public ResultBean del( String sid ) {
+        return dictTypeFeign.delete(sid);
+    }
+
+    public ResultBean<PagerVo<DictTypeVo>> pageList(PagerQuery<DictTypeQuery> pagerQuery) {
+        return dictTypeFeign.pageList(pagerQuery);
+    }
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeVo.java
new file mode 100644
index 0000000..0861047
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/dicttype/DictTypeVo.java
@@ -0,0 +1,32 @@
+package com.yxt.wms.biz.func.dicttype;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:18
+ * @description 数据字典类型返回数据
+ */
+@Data
+public class DictTypeVo implements Vo {
+    private static final long serialVersionUID = 9052935182700117654L;
+
+    @ApiModelProperty(value = "数据类型sid")
+    private String sid;
+
+    @ApiModelProperty(value = "类型代码")
+    private String dictTypeCode;
+
+    @ApiModelProperty(value = "类型名称")
+    private String dictTypeName;
+
+    @ApiModelProperty(value = "说明")
+    private String remarks;
+
+    @ApiModelProperty(value = "分组名称")
+    private String groupName;
+
+
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenu.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenu.java
new file mode 100644
index 0000000..8982dda
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenu.java
@@ -0,0 +1,64 @@
+package com.yxt.wms.biz.func.sysmenu;
+
+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: anrui_portal(门户建设) <br/>
+ * File: SysMenu.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenu <br/>
+ * Description: 菜单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表", description = "菜单表")
+@TableName("sys_menu")
+@Data
+public class SysMenu extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("菜单名称")
+    private String name;
+    
+	@ApiModelProperty("菜单路由路径(VUE)")
+    private String menuUrl;
+    
+	@ApiModelProperty("菜单对应的前端页面路径")
+    private String pageUrl;
+    
+	@ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+    
+	@ApiModelProperty("是否显示,默认为1显示，0为不显示")
+    private String isShow;
+    
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+    
+	@ApiModelProperty("上级sid")
+    private String pSid;
+    
+	@ApiModelProperty("前端页面路径重定向")
+    private Integer pageUrlRedirect;
+    
+	@ApiModelProperty("前端页面名称（vue组件名）")
+    private String pageName;
+    
+	@ApiModelProperty("前端页面别名")
+    private String pageAliasName;
+    
+	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
+    private String menuType;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuDto.java
new file mode 100644
index 0000000..547b355
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuDto.java
@@ -0,0 +1,72 @@
+package com.yxt.wms.biz.func.sysmenu;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuDto <br/>
+ * Description: 菜单表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 数据传输对象", description = "菜单表 数据传输对象")
+@Data
+public class SysMenuDto implements Dto {
+
+
+    private static final long serialVersionUID = -8143707488992909267L;
+    @ApiModelProperty(value = "菜单名称", required = true)
+    @NotBlank(message = "菜单名称不能为空")
+    private String name;
+
+    @ApiModelProperty("菜单路由路径(VUE)")
+    private String menuUrl;
+
+    @ApiModelProperty("菜单对应的前端页面路径")
+    private String pageUrl;
+
+    @ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+
+    @ApiModelProperty(value = "资源sid", required = true)
+    @NotBlank(message = "资源不能为空")
+    private String sourceSid;
+
+    @ApiModelProperty(value = "是否显示,默认为1显示，0为不显示", required = true)
+    @NotBlank(message = "是否显示不能为空")
+    private String isShow;
+
+    @ApiModelProperty("排序号")
+    private Integer sortNo;
+
+    @ApiModelProperty(value = "上级sid", example = "0", required = true)
+    @NotBlank(message = "上级菜单不能为空")
+    private String pSid;
+
+    @ApiModelProperty(value = "前端页面路径重定向", required = false)
+    private Integer pageUrlRedirect;
+
+    @ApiModelProperty("前端页面名称（vue组件名）")
+    private String pageName;
+
+    @ApiModelProperty(value = "前端页面别名", required = false)
+    private String pageAliasName;
+
+    @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
+    private String menuType;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuFunctionQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuFunctionQuery.java
new file mode 100644
index 0000000..fb09f0d
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuFunctionQuery.java
@@ -0,0 +1,30 @@
+package com.yxt.wms.biz.func.sysmenu;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuQuery <br/>
+ * Description: 菜单表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 查询条件 功能菜单设置查询用", description = "菜单表 查询条件 功能菜单设置查询用")
+@Data
+public class SysMenuFunctionQuery implements Query {
+
+
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuMapper.java
new file mode 100644
index 0000000..1ee095f
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuMapper.java
@@ -0,0 +1,82 @@
+package com.yxt.wms.biz.func.sysmenu;
+
+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 org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuMapper.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysmenu.SysMenuMapper <br/>
+ * Description: 菜单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SysMenuMapper extends BaseMapper<SysMenu> {
+
+	//@Update("update sys_menu set name=#{msg} where id=#{id}")
+	//IPage<SysMenuVo> voPage(IPage<SysMenu> page, @Param(Constants.WRAPPER) QueryWrapper<SysMenu> qw);
+
+	IPage<SysMenuVo> selectPageVo(IPage<SysMenu> page, @Param(Constants.WRAPPER) Wrapper<SysMenu> qw);
+
+	List<SysMenuVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysMenu> qw);
+
+	@Select("select * from sys_menu")
+	List<SysMenuVo> selectListVo();
+
+	List<SysMenuVo> listAllParentByRoleSid(String roleSid, String sid, @Param("sourceSid") String sourceSid);
+
+	@Select("SELECT menu.*,sourceMenu.`sourceSid` FROM  sys_menu menu  " +
+			"LEFT JOIN sys_source_menu sourceMenu  ON menu.sid=sourceMenu.menuSid where menu.sid=#{sid}")
+	SysMenu fetchBySid(@Param("sid") String sid);
+
+	List<SysMenuTreeVo> getChildrensForMenuTree(@Param(Constants.WRAPPER) QueryWrapper<SysMenuTreeVo> qw);
+
+	/**
+	 * 将该资源下的所有菜单设置是否可用
+	 *
+	 * @param sid      资源sid
+	 * @param isEnable 是否可用：1可用，0不可用
+	 * @return
+	 */
+	int updateBySourceSid(@Param("sid") String sid, @Param("isEnable") Integer isEnable);
+
+	/**
+	 * 根据上级sid查询菜单的子集菜单
+	 *
+	 * @param sid 菜单sid
+	 * @return
+	 */
+	List<SysMenuTreeVo> selectChildernList(String sid);
+
+	/**
+	 * 查询该资源下是否有可用的菜单
+	 *
+	 * @param isEnable
+	 * @return
+	 */
+	int selectBySourceSid(@Param("isEnable") int isEnable, @Param("sourceSid") String sourceSid);
+
+    List<SysMenu> selectByMenuUrl(String menuUrl);
+
+	/**
+	 * 查询该资源下一级菜单列表
+	 *
+	 * @param sourceSid 资源sid
+	 * @return
+	 */
+	List<SysMenuTreeVo> fetchRootMenuBySourceSid(@Param("sourceSid") String sourceSid);
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuMapper.xml
new file mode 100644
index 0000000..d2de1b0
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuMapper.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.sysmenu.SysMenuMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuVo">
+        SELECT *
+        FROM sys_menu
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuVo">
+        SELECT menu.*, source.sourceName, pmenu.name as pName
+        FROM sys_menu menu
+                     left join sys_menu pmenu on pmenu.sid = menu.psid
+                     left join sys_source_menu sourceMenu on sourceMenu.menuSid = menu.sid
+                     left join sys_source source on source.sid = sourceMenu.sourceSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="listAllParentByRoleSid" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuVo">
+        SELECT menu.*, ISNULL(menuRole.sid) as checked
+        FROM sys_menu menu
+                     left join sys_menu_role menuRole on menu.sid = menuRole.menuSid AND menuRole.roleSid = #{param1}
+                where menu.pSid = #{param2}
+        <if test="sourceSid != null">
+            and menu.sourceSid = #{sourceSid}
+        </if>
+    </select>
+    <select id="getChildrensForMenuTree" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuTreeVo">
+        SELECT menu.*, source.sourceName, sourceMenu.menuRootSid as menuRootSid
+        FROM sys_menu menu
+                     left join sys_source_menu sourceMenu on sourceMenu.menuSid = menu.sid
+                     left join sys_source source on source.sid = sourceMenu.sourceSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <!--将该资源下的所有菜单设置为是否可用-->
+    <update id="updateBySourceSid">
+        update sys_menu
+        set isEnable = #{isEnable}
+        where sourceSid = #{sid}
+    </update>
+
+    <select id="selectChildernList" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuTreeVo">
+        SELECT menu.*, source.sourceName, menu.pSid as menuRootSid
+        FROM sys_menu menu
+                     left join sys_source source on source.sid = menu.sourceSid
+        where menu.pSid = #{sid}
+        ORDER BY menu.sortNo ASC
+    </select>
+
+    <select id="selectBySourceSid" resultType="int">
+        select count(*)
+        from sys_menu
+        where isEnable = #{isEnable}
+          and sourceSid = #{sourceSid}
+    </select>
+
+    <select id="selectByMenuUrl" resultType="com.yxt.wms.biz.func.sysmenu.SysMenu">
+        select * from sys_menu where menuUrl = #{menuUrl}
+    </select>
+    <!--将该资源下的所有一级菜单列表-->
+    <select id="fetchRootMenuBySourceSid"  resultType="com.yxt.wms.biz.func.sysmenu.SysMenuTreeVo">
+        SELECT menu.NAME              AS NAME,
+        menu.sid               AS sid,
+        menu.sid               AS sid,
+        source.sid   AS sourceSid,
+        menu.sortNo            AS sortNo,
+        menu.pSid              AS pSid,
+        source.sourceName      AS sourceName,
+        menu.sid AS menuRootSid,
+        menu.menuUrl           AS menuUrl,
+        menu.iconUrl           AS iconUrl,
+        menu.pageName          AS pageName,
+        menu.pageUrlRedirect   AS pageUrlRedirect,
+        menu.pageUrl           AS pageUrl,
+        menu.remarks,
+        menu.isEnable
+        FROM sys_menu menu
+        LEFT JOIN sys_source source ON menu.sourceSid = source.sid
+        WHERE source.sid = #{sourceSid} AND menu.psid='0' and menu.isDelete!=1
+        ORDER BY menu.sortNo ASC
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuQuery.java
new file mode 100644
index 0000000..dfd1cc5
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuQuery.java
@@ -0,0 +1,66 @@
+package com.yxt.wms.biz.func.sysmenu;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuQuery <br/>
+ * Description: 菜单表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 查询条件", description = "菜单表 查询条件")
+@Data
+public class SysMenuQuery implements Query {
+
+    
+	@ApiModelProperty("菜单名称")
+    private String name;
+
+	@ApiModelProperty("菜单路由路径(VUE)")
+    private String menuUrl;
+    
+	@ApiModelProperty("菜单对应的前端页面路径")
+    private String pageUrl;
+    
+	@ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+	@ApiModelProperty("用户sid")
+    private String userSid;
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+
+	@ApiModelProperty("是否显示,默认为1显示，0为不显示")
+    private String isShow;
+    
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+    
+	@ApiModelProperty("上级sid")
+    private String pSid;
+    
+	@ApiModelProperty("前端页面路径重定向")
+    private Integer pageUrlRedirect;
+    
+	@ApiModelProperty("前端页面名称（vue组件名）")
+    private String pageName;
+    
+	@ApiModelProperty("前端页面别名")
+    private String pageAliasName;
+    
+	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
+    private String menuType;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuService.java
new file mode 100644
index 0000000..866b058
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuService.java
@@ -0,0 +1,407 @@
+package com.yxt.wms.biz.func.sysmenu;
+
+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.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysmenurole.SysMenuRoleVo;
+import com.yxt.wms.feign.portal.sysmenu.SysMenuFeign;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuService.java <br/>
+ * Class: com.yxt.user.biz.sysmenu.SysMenuService <br/>
+ * Description: 菜单表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
+    @Autowired
+    SysMenuFeign sysMenuFeign;
+
+
+
+    public PagerVo<SysMenu> listPage(PagerQuery<SysMenuQuery> pq) {
+        SysMenuQuery query = pq.getParams();
+        QueryWrapper<SysMenu> qw = createQueryWrapper(query);
+        IPage<SysMenu> page = PagerUtil.queryToPage(pq);
+        IPage<SysMenu> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<SysMenu> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    @Override
+    public SysMenu fetchBySid(String sid) {
+        return baseMapper.fetchBySid(sid);
+    }
+
+    public List<SysMenu> listAll(SysMenuQuery query) {
+        QueryWrapper<SysMenu> qw = createQueryWrapper(query);
+        return baseMapper.selectList(qw);
+    }
+
+    private QueryWrapper<SysMenu> createQueryWrapper(SysMenuQuery query) {
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<SysMenu> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.eq("name", query.getName());
+        }
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            qw.eq("menuUrl", query.getMenuUrl());
+        }
+        if (StringUtils.isNotBlank(query.getPageUrl())) {
+            qw.eq("pageUrl", query.getPageUrl());
+        }
+        if (StringUtils.isNotBlank(query.getIconUrl())) {
+            qw.eq("iconUrl", query.getIconUrl());
+        }
+        if (query.getSourceSid() != null) {
+            qw.eq("sourceSid", query.getSourceSid());
+        }
+        if (StringUtils.isNotBlank(query.getIsShow())) {
+            qw.eq("isShow", query.getIsShow());
+        }
+
+        if (query.getSortNo() != null) {
+            qw.eq("sortNo", query.getSortNo());
+        }
+
+        if (StringUtils.isNotBlank(query.getPSid())) {
+            qw.eq("pSid", query.getPSid());
+        }
+
+        if (query.getPageUrlRedirect() != null) {
+            qw.eq("pageUrlRedirect", query.getPageUrlRedirect());
+        }
+
+        if (StringUtils.isNotBlank(query.getPageName())) {
+            qw.eq("pageName", query.getPageName());
+        }
+
+        if (StringUtils.isNotBlank(query.getPageAliasName())) {
+            qw.eq("pageAliasName", query.getPageAliasName());
+        }
+
+        if (StringUtils.isNotBlank(query.getMenuType())) {
+            qw.eq("menuType", query.getMenuType());
+        }
+        return qw;
+    }
+
+    public ResultBean<PagerVo<SysMenuVo>> listPageVo(PagerQuery<SysMenuQuery> pq) {
+        return sysMenuFeign.listPage(pq);
+    }
+
+    /*	public List<SysMenuVo> listAllVo(SysMenuQuery query) {
+            QueryWrapper<SysMenu> qw = new QueryWrapper<>();
+            qw.eq("menu.pSid", "0");
+            List<SysMenuVo> sysMenuVos = baseMapper.selectListAllVo(qw);
+            for(SysMenuVo s:sysMenuVos){
+                getChildrens(s);
+            }
+            return sysMenuVos;
+        }*/
+    public ResultBean<List<SysMenuTreeVo>>  listAllVoForSource(SysMenuQuery query) {
+
+        return sysMenuFeign.listAllVoForSource(query);
+    }
+    public ResultBean<List<Map<String,String>>>  getMenusForFunction(SysMenuFunctionQuery sysMenuFunctionQuery) {
+        return sysMenuFeign.getMenusForFunction(sysMenuFunctionQuery);
+    }
+    public ResultBean<List<Map<String, Object>>>  sourceMenuTreeByUserSid(SysMenuQuery query) {
+        return sysMenuFeign.sourceMenuTreeByUserSid(query);
+    }
+
+    public ResultBean<List<Map<String, Object>>>  sourcemenutree(SysMenuQuery query) {
+        return sysMenuFeign.sourcemenutree(query);
+    }
+
+    public void getChildList(List<SysMenuTreeVo> list) {
+        list.forEach(str -> {
+            String sid = str.getSid();
+            List<SysMenuTreeVo> listChildren = baseMapper.selectChildernList(sid);
+            str.setChildren(listChildren);
+            getChildList(listChildren);
+        });
+    }
+
+    /*暂时废弃*/
+	/*private List<SysMenuTreeVo> getChildrensForMenuTree(List<SysMenuTreeVo> sysMenuVoList) {
+		List<SysMenuTreeVo> list = new ArrayList<>();
+		for (SysMenuTreeVo s : sysMenuVoList) {
+			SysMenu sysMenu = sysMenuService.fetchBySid(s.getMenuRootSid());
+			SysMenuTreeVo sysMenuTreeVo = new SysMenuTreeVo();
+			BeanUtil.copyProperties(sysMenu, sysMenuTreeVo);
+			list.add(sysMenuTreeVo);
+		}
+		for (SysMenuTreeVo s : list) {
+			getChildrensForMenuTree(s, s.getSid());
+		}
+		return list;
+	}
+	private void getChildrensForMenuTree(SysMenuTreeVo s,String sid){
+		QueryWrapper<SysMenuTreeVo> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(sid)) {
+			qw.eq("menu.pSid", sid);
+		}
+		List<SysMenuTreeVo> sysMenuVos = baseMapper.getChildrensForMenuTree(qw);
+		if(!sysMenuVos.isEmpty()){
+			for(SysMenuTreeVo smv:sysMenuVos){
+				getChildrensForMenuTree(smv,smv.getSid());
+			}
+		}
+		s.setChildren(sysMenuVos);
+	}
+	private void getChildrens(SysMenuVo s){
+		String sid = s.getSid();
+		QueryWrapper<SysMenu> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(sid)) {
+			qw.eq("menu.pSid", sid);
+		}
+		List<SysMenuVo> sysMenuVos = baseMapper.selectListAllVo(qw);
+		if(!sysMenuVos.isEmpty()){
+			for(SysMenuVo smv:sysMenuVos){
+				getChildrens(smv);
+			}
+		}
+		s.setChildren(sysMenuVos);
+	}*/
+    public ResultBean<List<SysMenuVo>> listVo() {
+        return sysMenuFeign.list();
+    }
+
+   /* public void saveOrUpdateDto(SysMenuDto dto) {
+        SysMenu entity = new SysMenu();
+        dto.fillEntity(entity);
+        SysSourceMenu sysSourceMenu = new SysSourceMenu();
+        sysSourceMenu.setMenuSid(entity.getSid());
+        sysSourceMenu.setSourceSid(dto.getSourceSid());
+        setRootSid(entity, sysSourceMenu);
+        sysSourceMenuService.save(sysSourceMenu);
+        this.saveOrUpdate(entity);
+    }*/
+
+//    private void setRootSid(SysMenu entity, SysSourceMenu sysSourceMenu) {
+//        String pSid = entity.getPSid();
+//        if ("0".equals(pSid)) {
+//            sysSourceMenu.setMenuRootSid(entity.getSid());
+//        } else {
+//            SysMenu sysMenu = sysMenuService.fetchBySid(pSid);
+//            String pSid1 = sysMenu.getPSid();
+//            if ("0".equals(pSid1)) {
+//                sysSourceMenu.setMenuRootSid(sysMenu.getSid());
+//            }
+//            setRootSid(sysMenu, sysSourceMenu);
+//        }
+//    }
+
+    public SysMenuVo fetchByIdVo(String id) {
+        SysMenu entity = this.fetchById(id);
+        SysMenuVo vo = new SysMenuVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public ResultBean<List<SysMenuVo>> listAllByRoleSid(SysMenuQuery query) {
+
+        return sysMenuFeign.listAllByRoleSid(query);
+    }
+
+    private void getChildrensByRoleSid(SysMenuVo s, String roleSid, String sourceSid) {
+        String sid = s.getSid();
+        List<SysMenuVo> sysMenuVos = baseMapper.listAllParentByRoleSid(roleSid, sid, sourceSid);
+        if (!sysMenuVos.isEmpty()) {
+            for (SysMenuVo smv : sysMenuVos) {
+                getChildrensByRoleSid(smv, roleSid, sourceSid);
+            }
+        }
+        s.setChildren(sysMenuVos);
+    }
+
+	/*public List<SysMenuTreeVo> listAllVoBySourceSId(SysMenuQuery query) {
+		SysSource sysSource = sysSourceService.fetchBySid(query.getSourceSid());
+		List<SysMenuTreeVo> sysSourceVos = new ArrayList<>();//sysSourceService.listAllVoBySourceSId(query.getSourceSid());
+		SysMenuTreeVo smtv=new SysMenuTreeVo();
+		smtv.setName(sysSource.getSourceName());
+		smtv.setSid(sysSource.getSid());
+		smtv.setSourceSid(sysSource.getSid());
+		sysSourceVos.add(smtv);
+		for(SysMenuTreeVo s:sysSourceVos){
+			List<SysMenuTreeVo> sysMenuVoList=sysSourceMenuService.fetchRootMenuBySourceSid(s.getSourceSid());
+			if(!sysMenuVoList.isEmpty()){
+				sysMenuVoList = getChildrensForMenuTree(sysMenuVoList);
+			}
+			s.setChildren(sysMenuVoList);
+		}
+		return sysSourceVos;
+	}*/
+
+    /**
+     * 资源菜单树形列表
+     *
+     * @return 资源菜单树形列表（第一级一级菜单 第二级二级菜单）
+     */
+    public List<Map<String, Object>> getSourceMenuTree(List<SysMenuRoleVo> list_menu, Map<String, Object> map_selectMenus) {
+
+        //获取当前资源的菜单列表
+        List<Map<String, Object>> list_menus_map = new ArrayList<Map<String, Object>>();
+
+
+        //获取资源第一级菜单列表
+        List<SysMenuRoleVo> list_firstLevel_menu = list_menu.stream().filter(s -> s.getPSid().equals("0")).collect(Collectors.toList());
+
+        //遍历资源的第一级菜单
+        for (int i = 0; i < list_firstLevel_menu.size(); i++) {
+            Map<String, Object> map_firstLevel_menu = getMenuTreeFromStream(list_firstLevel_menu.get(i).getSid(), list_menu, map_selectMenus);
+            //把该菜单挂在当前菜单列表中
+            if (null != map_firstLevel_menu)
+                list_menus_map.add(map_firstLevel_menu);
+        }
+        return list_menus_map;
+
+    }
+
+    /**
+     * 递归把list转换成菜单树形列表
+     *
+     * @param psid
+     * @param list_menu
+     * @return
+     */
+    private Map<String, Object> getMenuTreeFromStream(String psid, List<SysMenuRoleVo> list_menu, Map<String, Object> map_selectMenus) {
+        //获取当前菜单
+        List<SysMenuRoleVo> list_current_menu = list_menu.stream().filter(s -> s.getSid().equals(psid)).collect(Collectors.toList());
+        if (null == list_current_menu || 0 == list_current_menu.size())
+            return null;
+
+        Map<String, Object> map_menu = getMenuMap(list_current_menu.get(0), map_selectMenus);
+
+        //2.获取菜单的子菜单列表
+        //存储最终子菜单列表结果
+        List<Map<String, Object>> list_child = new ArrayList<Map<String, Object>>();
+
+        //获取子菜单列表
+        List<SysMenuRoleVo> list_child_menu = list_menu.stream().filter(s -> s.getPSid().equals(psid)).collect(Collectors.toList());
+        for (int i = 0; i < list_child_menu.size(); i++) {
+            //获取该菜单子菜单列表
+            Map<String, Object> map_child_menu = getMenuTreeFromStream(list_child_menu.get(i).getSid(), list_menu, map_selectMenus);
+            //把该菜单挂在当前菜单列表中
+            if (null != map_child_menu)
+                list_child.add(map_child_menu);
+        }
+        //把该菜单列表放到父菜单的childMenus中
+        map_menu.put("children", list_child);
+
+        return map_menu;
+
+    }
+
+    /**
+     * 构造菜单的结果map
+     *
+     * @return
+     */
+    private Map<String, Object> getMenuMap(SysMenuRoleVo menuVo, Map<String, Object> map_selectMenus) {
+        Map<String, Object> map_menu = new HashMap<String, Object>();
+
+        if (null != map_selectMenus) {
+            //角色授权时，菜单列表
+            map_menu.put("sid", menuVo.getSid());
+            map_menu.put("menuName", menuVo.getMenuName() + (StringUtils.isNotBlank(menuVo.getRemarks()) ? "(" + menuVo.getRemarks() + ")" : ""));
+            map_menu.put("menuUrl", menuVo.getMenuUrl());
+            map_menu.put("pageUrl", menuVo.getPageUrl());
+            map_menu.put("iconUrl", menuVo.getIconUrl());
+            map_menu.put("isShow", menuVo.getIsShow());
+            if (menuVo.getAlwaysShow() == 0) {
+                map_menu.put("alwaysShow", false);
+            } else if (menuVo.getAlwaysShow() == 1) {
+                map_menu.put("alwaysShow", true);
+            }
+
+            //如果角色已有的菜单，则设置选中，并移除map中的项；否则设置不选中
+            if (map_selectMenus.containsKey(menuVo.getSid())) {
+                map_menu.put("isCheck", 1);
+                map_selectMenus.remove(menuVo.getSid());
+            } else {
+                map_menu.put("isCheck", 0);
+            }
+        } else {
+            //左侧菜单列表
+            Map<String, Object> map_meta = new HashMap<String, Object>();
+            map_meta.put("title", menuVo.getMenuName());
+            map_meta.put("icon", menuVo.getIconUrl());
+            map_menu.put("meta", map_meta);
+
+            map_menu.put("redirect", menuVo.getPageUrlRedirect());
+            //路径
+            map_menu.put("path", menuVo.getPageUrl() != null && !menuVo.getPageUrl().equals("") ? menuVo.getPageUrl() : "/" + menuVo.getPageName());
+            map_menu.put("name", menuVo.getPageAliasName() != null && !menuVo.getPageAliasName().equals("") ? menuVo.getPageAliasName() : menuVo.getPageUrl());
+            //组件名
+            map_menu.put("component", menuVo.getPageName());
+            if (menuVo.getAlwaysShow() == 0) {
+                map_menu.put("alwaysShow", false);
+            } else if (menuVo.getAlwaysShow() == 1) {
+                map_menu.put("alwaysShow", true);
+            }
+        }
+        return map_menu;
+    }
+
+    /**
+     * 将该资源下的所有菜单设置为是否可用
+     *
+     * @param sid      资源sid
+     * @param isEnable 是否可用：1可用，0不可用
+     * @return
+     */
+    public int updateBySourceSid(String sid, Integer isEnable) {
+        return baseMapper.updateBySourceSid(sid, isEnable);
+    }
+
+    public ResultBean saveMenu(SysMenuDto dto) {
+        return sysMenuFeign.save(dto);
+    }
+    public ResultBean updateBySid( SysMenuDto dto, String sid) {
+        return sysMenuFeign.update(dto,sid);
+    }
+    public ResultBean updateIsEnable( String sid,  Integer isEnable) {
+        return sysMenuFeign.updateIsEnable(sid,isEnable);
+    }
+    public ResultBean delBySids( String sid) {
+        return sysMenuFeign.delBySids(sid);
+    }
+
+    public List<SysMenu> selectByMenuUrl(String menuUrl) {
+        return baseMapper.selectByMenuUrl(menuUrl);
+    }
+
+    /**
+     * 根据资源sid查询该资源下的一级菜单列表（yxt_mtl 2024-01-31）
+     *
+     * @param sid 资源sid
+     * @return
+     */
+    public List<SysMenuTreeVo> fetchRootMenuBySourceSid(String sid) {
+        return baseMapper.fetchRootMenuBySourceSid(sid);
+    }
+
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuTreeVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuTreeVo.java
new file mode 100644
index 0000000..a3e2b6a
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuTreeVo.java
@@ -0,0 +1,59 @@
+package com.yxt.wms.biz.func.sysmenu;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuVo <br/>
+ * Description: 菜单表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 视图数据对象", description = "菜单表 视图数据对象")
+@Data
+public class SysMenuTreeVo implements Vo {
+	@ApiModelProperty("菜单名称")
+    private String name;
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+	@ApiModelProperty("上级sid")
+    private String pSid;
+	@ApiModelProperty("上级菜单名称")
+    private String pName;
+	@ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("资源名称")
+    private String sourceName;
+    @ApiModelProperty("菜单根路径sid")
+    private String menuRootSid;
+    @ApiModelProperty("pageUrl")
+    private String pageUrl;
+    @ApiModelProperty("menuUrl")
+    private String menuUrl;
+    @ApiModelProperty("menuUrl")
+    private String pageName;
+    @ApiModelProperty("iconUrl")
+    private String iconUrl;
+    @ApiModelProperty("菜单列表用，是否是资源层级1是，0不是")
+    private String isSource = "0";
+    @ApiModelProperty("是否可用")
+    private String isEnable;
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+    @ApiModelProperty("子菜单")
+    private List<SysMenuTreeVo> children;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuVo.java
new file mode 100644
index 0000000..07fbc33
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuVo.java
@@ -0,0 +1,74 @@
+package com.yxt.wms.biz.func.sysmenu;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuVo <br/>
+ * Description: 菜单表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 视图数据对象", description = "菜单表 视图数据对象")
+@Data
+public class SysMenuVo implements Vo {
+
+    
+	@ApiModelProperty("菜单名称")
+    private String name;
+    
+	@ApiModelProperty("菜单路由路径(VUE)")
+    private String menuUrl;
+    
+	@ApiModelProperty("菜单对应的前端页面路径")
+    private String pageUrl;
+    
+	@ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+    
+	@ApiModelProperty("是否显示,默认为1显示，0为不显示")
+    private String isShow;
+    
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+    
+	@ApiModelProperty("上级sid")
+    private String pSid;
+	@ApiModelProperty("上级名称")
+    private String pName;
+	@ApiModelProperty("sid")
+    private String sid;
+
+	@ApiModelProperty("前端页面路径重定向")
+    private Integer pageUrlRedirect;
+    
+	@ApiModelProperty("前端页面名称（vue组件名）")
+    private String pageName;
+    
+	@ApiModelProperty("前端页面别名")
+    private String pageAliasName;
+    
+	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
+    private String menuType;
+    @ApiModelProperty("子菜单")
+	private List<SysMenuVo> children;
+    @ApiModelProperty("是否选中，1：未选中,0：选中")
+    private String checked;
+    @ApiModelProperty("资源名称")
+    private String sourceName;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/MenuRoleVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/MenuRoleVo.java
new file mode 100644
index 0000000..15f263c
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/MenuRoleVo.java
@@ -0,0 +1,19 @@
+package com.yxt.wms.biz.func.sysmenurole;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 菜单和角色临时存储
+ * @author: dimengzhe
+ * @date: 2023/6/1
+ **/
+@Data
+public class MenuRoleVo {
+
+
+    @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)")
+    private String dataRuleId;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRole.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRole.java
new file mode 100644
index 0000000..9c2b4f7
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRole.java
@@ -0,0 +1,37 @@
+package com.yxt.wms.biz.func.sysmenurole;
+
+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: anrui_portal(门户建设) <br/>
+ * File: SysMenuRole.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRole <br/>
+ * Description: 菜单与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表", description = "菜单与角色关联表")
+@TableName("sys_menu_role")
+@Data
+public class SysMenuRole extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+
+    @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)")
+    private String dataRuleId;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleDataDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleDataDto.java
new file mode 100644
index 0000000..06751d6
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleDataDto.java
@@ -0,0 +1,30 @@
+package com.yxt.wms.biz.func.sysmenurole;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto <br/>
+ * Description: 菜单与角色关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 数据传输对象", description = "菜单与角色关联表 数据传输对象")
+@Data
+public class SysMenuRoleDataDto implements Dto {
+
+    @ApiModelProperty("菜单与角色关联表sid")
+    private String sid;
+    @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)")
+    private String dataRuleId;
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleDataQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleDataQuery.java
new file mode 100644
index 0000000..e288a9b
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleDataQuery.java
@@ -0,0 +1,30 @@
+package com.yxt.wms.biz.func.sysmenurole;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery <br/>
+ * Description: 菜单与角色关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 查询条件", description = "菜单与角色关联表 查询条件")
+@Data
+public class SysMenuRoleDataQuery implements Query {
+
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("菜单名称")
+    private String menuName;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleDataVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleDataVo.java
new file mode 100644
index 0000000..4d57f12
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleDataVo.java
@@ -0,0 +1,32 @@
+package com.yxt.wms.biz.func.sysmenurole;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo <br/>
+ * Description: 菜单与角色关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 视图数据对象", description = "菜单与角色关联表 视图数据对象")
+@Data
+public class SysMenuRoleDataVo implements Vo {
+
+    @ApiModelProperty("菜单与角色关联表sid")
+    private String sid;
+	@ApiModelProperty("菜单名称")
+    private String name;
+    @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)")
+    private String dataRuleId;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleDto.java
new file mode 100644
index 0000000..77366a6
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleDto.java
@@ -0,0 +1,31 @@
+package com.yxt.wms.biz.func.sysmenurole;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto <br/>
+ * Description: 菜单与角色关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 数据传输对象", description = "菜单与角色关联表 数据传输对象")
+@Data
+public class SysMenuRoleDto implements Dto {
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleMapper.java
new file mode 100644
index 0000000..8d612e2
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleMapper.java
@@ -0,0 +1,56 @@
+package com.yxt.wms.biz.func.sysmenurole;
+
+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 org.apache.ibatis.annotations.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleMapper.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleMapper <br/>
+ * Description: 菜单与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SysMenuRoleMapper extends BaseMapper<SysMenuRole> {
+
+    //@Update("update sys_menu_role set name=#{msg} where id=#{id}")
+    //IPage<SysMenuRoleVo> voPage(IPage<SysMenuRole> page, @Param(Constants.WRAPPER) QueryWrapper<SysMenuRole> qw);
+
+    IPage<SysMenuRoleVo> selectPageVo(IPage<SysMenuRole> page, @Param(Constants.WRAPPER) Wrapper<SysMenuRole> qw);
+
+    List<SysMenuRoleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysMenuRole> qw);
+
+    @Select("select * from sys_menu_role")
+    List<SysMenuRoleVo> selectListVo();
+
+    @Delete("delete from sys_menu_role where roleSid=#{roleSid}")
+    void delByRoleSid(@Param("roleSid") String roleSid);
+
+    List<SysMenuRoleVo> list(@Param(Constants.WRAPPER) QueryWrapper<SysMenuRoleVo> qw);
+
+    List<MenuRoleVo> selectByRoleSid(String roleSid);
+
+    List<SysMenuRoleDataVo> selMenuByRole(@Param(Constants.WRAPPER) QueryWrapper qw);
+
+    List<SysMenuRoleDataVo> selMenuByRoleApp(@Param(Constants.WRAPPER) QueryWrapper qw);
+
+    @Update("update sys_menu_role set dataRuleId = #{dataRuleId} where sid = #{sid}")
+    void updateDataByRoleMenu(@Param("sid") String sid,@Param("dataRuleId") String dataRuleId);
+
+    @Update("update sys_mobile_menu_role set dataRuleId = #{dataRuleId} where sid = #{sid}")
+    void updateDataByRoleMenuApp(@Param("sid") String sid,@Param("dataRuleId") String dataRuleId);
+
+
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleMapper.xml
new file mode 100644
index 0000000..824f26c
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleVo">
+        SELECT * FROM sys_menu_role
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleVo">
+        SELECT * FROM sys_menu_role
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="list" parameterType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleQuery"
+            resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleVo">
+        SELECT distinct rm.menuSid as sid,
+                        m.name     as menuName,
+                        m.menuUrl,
+                        m.pageUrl,
+                        m.pageName,
+                        m.pageUrlRedirect,
+                        m.pageAliasName,
+                        m.iconUrl,
+                        m.sourceSid,
+                        m.isShow,
+                        m.pSid,
+                        m.sortNo,
+                        m.remarks,
+                        1          as alwaysShow
+        FROM sys_menu_role rm
+                     LEFT JOIN sys_menu m ON rm.menuSid = m.sid
+                ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectByRoleSid" resultType="com.yxt.wms.biz.func.sysmenurole.MenuRoleVo">
+        select menuSid, dataRuleId
+        from sys_menu_role
+        where roleSid = #{roleSid}
+    </select>
+
+    <select id="selMenuByRole" resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleDataVo">
+        SELECT
+        smr.sid,
+        sm.`name`,
+        smr.`dataRuleId`
+        FROM
+        sys_menu sm
+        LEFT JOIN sys_menu_role smr
+        ON smr.`menuSid` = sm.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selMenuByRoleApp" resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleDataVo">
+        SELECT
+        smmr.sid,
+        smm.`name`,
+        smmr.`dataRuleId`
+        FROM
+        sys_mobile_menu smm
+        LEFT JOIN sys_mobile_menu_role smmr
+        ON smmr.`menuSid` = smm.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleQuery.java
new file mode 100644
index 0000000..0cbae73
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleQuery.java
@@ -0,0 +1,40 @@
+package com.yxt.wms.biz.func.sysmenurole;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery <br/>
+ * Description: 菜单与角色关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 查询条件", description = "菜单与角色关联表 查询条件")
+@Data
+public class SysMenuRoleQuery implements Query {
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("多个角色sid计集合")
+    private List<String> roleSids;
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+    @ApiModelProperty("是否是系统管理员")
+    private String isAdmin;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleService.java
new file mode 100644
index 0000000..d6a068d
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleService.java
@@ -0,0 +1,210 @@
+package com.yxt.wms.biz.func.sysmenurole;
+
+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.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysmenu.SysMenuService;
+import com.yxt.wms.feign.portal.sysmenurole.SysMenuRoleFeign;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleService.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleService <br/>
+ * Description: 菜单与角色关联表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SysMenuRoleService extends MybatisBaseService<SysMenuRoleMapper, SysMenuRole> {
+
+    @Autowired
+    SysMenuRoleFeign sysMenuRoleFeign;
+    @Autowired
+    SysMenuService sysMenuService;
+
+    public PagerVo<SysMenuRole> listPage(PagerQuery<SysMenuRoleQuery> pq) {
+        SysMenuRoleQuery query = pq.getParams();
+        QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
+        IPage<SysMenuRole> page = PagerUtil.queryToPage(pq);
+        IPage<SysMenuRole> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<SysMenuRole> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<SysMenuRole> listAll(SysMenuRoleQuery query) {
+        QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
+        return baseMapper.selectList(qw);
+    }
+
+    private QueryWrapper<SysMenuRole> createQueryWrapper(SysMenuRoleQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<SysMenuRole> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotBlank(query.getMenuSid())) {
+            qw.eq("menuSid", query.getMenuSid());
+        }
+
+        if (StringUtils.isNotBlank(query.getRoleSid())) {
+            qw.eq("roleSid", query.getRoleSid());
+        }
+        return qw;
+    }
+
+    public ResultBean<PagerVo<SysMenuRoleVo>> listPageVo(PagerQuery<SysMenuRoleQuery> pq) {
+        return sysMenuRoleFeign.listPage(pq);
+    }
+
+    public ResultBean<List<SysMenuRoleVo>> listAllVo(SysMenuRoleQuery query) {
+        QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
+        return sysMenuRoleFeign.listAll(query);
+    }
+
+    public ResultBean<List<SysMenuRoleVo>> listVo() {
+        return sysMenuRoleFeign.list();
+    }
+
+    public ResultBean saveOrUpdateDto(SysMenuRoleDto dto) {
+        return sysMenuRoleFeign.save(dto);
+    }
+    public ResultBean updateBySid(SysMenuRoleDto dto,String sid) {
+        return sysMenuRoleFeign.update(dto,sid);
+    }
+    public ResultBean updateRoleAndMenu(SysMenuRoleDto dto) {
+        return sysMenuRoleFeign.updateRoleAndMenu(dto);
+    }
+    public ResultBean del(String sid) {
+        return sysMenuRoleFeign.del(sid);
+    }
+
+    public ResultBean<SysMenuRoleVo> fetchByIdVo(String id) {
+        return sysMenuRoleFeign.fetch(id);
+    }
+
+    public void delByRoleSid(String roleSid) {
+        baseMapper.delByRoleSid(roleSid);
+    }
+
+    // 不分页列表
+    public List<SysMenuRoleVo> list(SysMenuRoleQuery query) {
+        // mybits所用的查询条件封装类
+        QueryWrapper<SysMenuRoleVo> qw = buildQueryWrapper(query);
+        return baseMapper.list(qw);
+    }
+
+    /**
+     * 解析和组装查询条件，封装在qw中
+     *
+     * @param query
+     * @return
+     */
+    private QueryWrapper<SysMenuRoleVo> buildQueryWrapper(SysMenuRoleQuery query) {
+        QueryWrapper<SysMenuRoleVo> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getSourceSid())) {
+                qw.eq("m.sourceSid", query.getSourceSid());
+            }
+			/*if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getRoleSid())) {
+				qw.in("rm.roleSid", query.getRoleSid());
+			}*/
+            if (StringUtils.isNotBlank(query.getIsAdmin())) {
+                if (!query.getIsAdmin().equals("1")){
+                    qw.eq("m.isEnable", 1);
+                }
+            }
+
+            if (query.getRoleSids() != null && query.getRoleSids().size() > 0) {
+                qw.in("rm.roleSid", query.getRoleSids());
+            }
+            qw.eq("m.isShow", 1);
+            qw.orderByAsc("m.sortNo");
+        }
+
+        return qw;
+
+    }
+
+    /**
+     * 资源菜单树形列表
+     *
+     * @param query:roleSids,sourceSid
+     * @return 资源菜单树形列表（第一级一级菜单 第二级二级菜单）
+     */
+    public List<Map<String, Object>> getSourceMenuTreeOfRoles(SysMenuRoleQuery query, Map<String, Object> map_rolemenus) {
+
+        //获取当前资源的菜单列表
+        List<Map<String, Object>> list_menus_map = new ArrayList<Map<String, Object>>();
+        if (null == query)
+            return list_menus_map;
+
+        //角色s的某个资源的所有菜单列表
+        List<SysMenuRoleVo> list_menu = list(query);
+        list_menus_map = sysMenuService.getSourceMenuTree(list_menu, map_rolemenus);
+
+        return list_menus_map;
+
+    }
+
+    public List<MenuRoleVo> selectByRoleSid(String roleSid) {
+        return baseMapper.selectByRoleSid(roleSid);
+    }
+
+    public ResultBean<List<SysMenuRoleDataVo>> selMenuByRole(SysMenuRoleDataQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("smr.roleSid",query.getRoleSid());
+        if (StringUtils.isNotBlank(query.getMenuName())){
+            qw.like("sm.name",query.getMenuName());
+        }
+        List<SysMenuRoleDataVo> sysMenuRoleDataVos = baseMapper.selMenuByRole(qw);
+        return rb.success().setData(sysMenuRoleDataVos);
+    }
+
+    public ResultBean<List<SysMenuRoleDataVo>> selMenuByRoleApp(SysMenuRoleDataQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("smmr.roleSid",query.getRoleSid());
+        if (StringUtils.isNotBlank(query.getMenuName())){
+            qw.like("smm.name",query.getMenuName());
+        }
+        List<SysMenuRoleDataVo> sysMenuRoleDataVos = baseMapper.selMenuByRoleApp(qw);
+        return rb.success().setData(sysMenuRoleDataVos);
+    }
+
+    public ResultBean updateDataByRoleMenu(List<SysMenuRoleDataDto> dtos) {
+        ResultBean rb = ResultBean.fireFail();
+        for (SysMenuRoleDataDto dto : dtos) {
+            if (StringUtils.isNotBlank(dto.getDataRuleId())){
+                baseMapper.updateDataByRoleMenu(dto.getSid(),dto.getDataRuleId());
+            }
+        }
+        return rb.success();
+    }
+
+    public ResultBean updateDataByRoleMenuApp(List<SysMenuRoleDataDto> dtos) {
+        ResultBean rb = ResultBean.fireFail();
+        for (SysMenuRoleDataDto dto : dtos) {
+            if (StringUtils.isNotBlank(dto.getDataRuleId())){
+                baseMapper.updateDataByRoleMenuApp(dto.getSid(),dto.getDataRuleId());
+            }
+        }
+        return rb.success();
+    }
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleVo.java
new file mode 100644
index 0000000..72b4718
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysmenurole/SysMenuRoleVo.java
@@ -0,0 +1,56 @@
+package com.yxt.wms.biz.func.sysmenurole;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo <br/>
+ * Description: 菜单与角色关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 视图数据对象", description = "菜单与角色关联表 视图数据对象")
+@Data
+public class SysMenuRoleVo implements Vo {
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("菜单父级sid")
+    private String pSid;
+	@ApiModelProperty("menusid")
+    private String sid;
+	@ApiModelProperty("menuUrl")
+    private String menuUrl;
+    @ApiModelProperty("menuName")
+    private String menuName;
+    @ApiModelProperty("pageUrl")
+    private String pageUrl;
+    @ApiModelProperty("iconUrl")
+    private String iconUrl;
+    @ApiModelProperty("isShow")
+    private String isShow;
+    @ApiModelProperty("alwaysShow")
+    private Integer alwaysShow;
+    @ApiModelProperty("pageUrlRedirect")
+    private String pageUrlRedirect;
+    @ApiModelProperty("pageAliasName")
+    private String pageAliasName;
+    @ApiModelProperty("pageName")
+    private String pageName;
+    @ApiModelProperty("remarks")
+    private String remarks;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/AppContactSysOrganizationVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/AppContactSysOrganizationVo.java
new file mode 100644
index 0000000..510b53e
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/AppContactSysOrganizationVo.java
@@ -0,0 +1,40 @@
+package com.yxt.wms.biz.func.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/9/24
+ */
+@ApiModel(value = "App通讯录组织架构")
+@Data
+public class AppContactSysOrganizationVo implements Vo {
+
+    @ApiModelProperty("部门/组织sid")
+    private String sid;
+
+    @ApiModelProperty("部门/组织名称|员工姓名")
+    private String name;
+
+    @ApiModelProperty("员工数量")
+    private int staffNum;
+
+    @ApiModelProperty("跳转类型：1、部门2、员工列表")
+    private Integer type;
+
+    @ApiModelProperty("员工电话")
+    private String mobile;
+
+    @ApiModelProperty("员工头像")
+    private String headImage;
+
+    @ApiModelProperty("员工所在部门名称（路径）")
+    private String orgNamePath;
+
+    @ApiModelProperty("员工职位")
+    private String position;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/QrCodeVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/QrCodeVo.java
new file mode 100644
index 0000000..ed3d8d7
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/QrCodeVo.java
@@ -0,0 +1,23 @@
+package com.yxt.wms.biz.func.sysorganization;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2020/11/3 16:19
+ * @description
+ */
+@Data
+public class QrCodeVo {
+    @ApiModelProperty("部门名称")
+    private String departmentName;
+    @ApiModelProperty("单位名称")
+    private String organizationName;
+    @ApiModelProperty("部门地址")
+    private String address;
+    @ApiModelProperty("二维码图片地址")
+    private String qrFilePath;
+    @ApiModelProperty(value = "部门sid")
+    private String sid;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrgListVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrgListVo.java
new file mode 100644
index 0000000..f4866ed
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrgListVo.java
@@ -0,0 +1,29 @@
+package com.yxt.wms.biz.func.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/14 11:45
+ * @Description 员工所在部门下拉列表
+ */
+@Data
+public class SysOrgListVo implements Vo {
+    private static final long serialVersionUID = -3558876605554852892L;
+
+    @ApiModelProperty(value = "组织名称")
+    private String name;
+    @ApiModelProperty(value = "部门编码")
+    private String orgCode;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "上级sid")
+    private String psid;
+    @ApiModelProperty(value = "orgSidPath")
+    private String orgSidPath;
+    private List<SysOrgVo> children;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrgStaffVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrgStaffVo.java
new file mode 100644
index 0000000..3945199
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrgStaffVo.java
@@ -0,0 +1,17 @@
+package com.yxt.wms.biz.func.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 11:48
+ * @Description
+ */
+@Data
+public class SysOrgStaffVo implements Vo {
+    private static final long serialVersionUID = -4311553944345419092L;
+
+    private String staffName;
+    private String staffSid;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrgVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrgVo.java
new file mode 100644
index 0000000..cdee16f
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrgVo.java
@@ -0,0 +1,31 @@
+package com.yxt.wms.biz.func.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/12 20:55
+ * @description
+ */
+@Data
+public class SysOrgVo implements Vo {
+    private static final long serialVersionUID = 2983637708030419942L;
+    @ApiModelProperty(value = "组织名称")
+    private String name;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "psid")
+    private String psid;
+    @ApiModelProperty(value = "id")
+    private String id;
+    @ApiModelProperty(value = "orgSidPath")
+    private String orgSidPath;
+    @ApiModelProperty(value = "部门编码")
+    private String orgCode;
+
+    private List<SysOrgVo> children;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganization.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganization.java
new file mode 100644
index 0000000..4389e5c
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganization.java
@@ -0,0 +1,87 @@
+package com.yxt.wms.biz.func.sysorganization;
+
+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: anrui_portal(门户建设) <br/>
+ * File: SysOrganization.java <br/>
+ * Class: SysOrganization <br/>
+ * Description: 组织机构表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "组织机构表", description = "组织机构表")
+@TableName("sys_organization")
+@Data
+public class SysOrganization extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+	@ApiModelProperty("部门/组织名称")
+    private String name;
+
+	@ApiModelProperty("父(部门/组织) sid")
+    private String psid;
+
+	@ApiModelProperty("联系电话")
+    private String linkPhone;
+	@ApiModelProperty("联系人")
+    private String linkPerson;
+
+	@ApiModelProperty("部门sid全路径")
+    private String orgSidPath;
+
+	@ApiModelProperty("排序")
+    private Integer sort;
+
+	@ApiModelProperty("地址")
+    private String addrs;
+
+	@ApiModelProperty("地理位置经纬度")
+    private String jwd;
+
+	@ApiModelProperty("二维码")
+    private String qrText;
+
+	@ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己")
+    private Integer limitOrgMember;
+
+	@ApiModelProperty("部门编码")
+    private String orgCode;
+
+//    @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））")
+//    private String orgShortName;
+
+    @ApiModelProperty("销售区域划分(本店终端销售：0,门店对应业务区域划分销售：1至9,具体编号划分各门店报备确定)")
+    private String regionDivision;
+
+    @ApiModelProperty("是否是部门(0否，1是)")
+    private Integer isDept;
+
+    @ApiModelProperty("组织简称")
+    private String orgAbbre;
+
+    @ApiModelProperty("组织属性key")
+    private String orgAttributeKey;
+
+    @ApiModelProperty("组织属性value")
+    private String orgAttributeValue;
+
+    @ApiModelProperty("管理层级key")
+    private String orgLevelKey;
+
+    @ApiModelProperty("管理层级value")
+    private String orgLevelValue;
+
+    @ApiModelProperty("其他编码")
+    private String otherCode;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationDto.java
new file mode 100644
index 0000000..b1f04a2
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationDto.java
@@ -0,0 +1,91 @@
+package com.yxt.wms.biz.func.sysorganization;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationDto.java <br/>
+ * Class: SysOrganizationDto <br/>
+ * Description: 组织机构表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "组织机构表 数据传输对象", description = "组织机构表 数据传输对象")
+@Data
+public class SysOrganizationDto implements Dto {
+
+    
+	@ApiModelProperty("部门/组织名称")
+    private String name;
+    
+	@ApiModelProperty("父(部门/组织) sid")
+    private String psid;
+    
+	@ApiModelProperty("联系电话")
+    private String linkPhone;
+	@ApiModelProperty("联系人")
+    private String linkPerson;
+
+	@ApiModelProperty("部门sid全路径")
+    private String orgSidPath;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("地址")
+    private String addrs;
+    
+	@ApiModelProperty("地理位置经纬度")
+    private String jwd;
+    
+	@ApiModelProperty("二维码")
+    private String qrText;
+    
+	@ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己")
+    private Integer limitOrgMember;
+    
+	@ApiModelProperty("部门编码")
+    private String orgCode;
+
+    @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））")
+    private String orgShortName;
+
+    @ApiModelProperty("销售区域划分(本店终端销售：0,门店对应业务区域划分销售：1至9,具体编号划分各门店报备确定)")
+    private String regionDivision;
+
+	@ApiModelProperty("主管人员sid")
+    private String zgStaffSid;
+
+	@ApiModelProperty("分管人员sid")
+    private String fgStaffSid;
+
+    @ApiModelProperty("组织简称")
+    private String orgAbbre;
+
+    @ApiModelProperty("是否是部门(0否，1是)")
+    private Integer isDept;
+
+    @ApiModelProperty("组织属性key")
+    private String orgAttributeKey;
+
+    @ApiModelProperty("组织属性value")
+    private String orgAttributeValue;
+
+    @ApiModelProperty("管理层级key")
+    private String orgLevelKey;
+
+    @ApiModelProperty("管理层级value")
+    private String orgLevelValue;
+
+    @ApiModelProperty("其他编码")
+    private String otherCode;
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationListQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationListQuery.java
new file mode 100644
index 0000000..9a6e542
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationListQuery.java
@@ -0,0 +1,16 @@
+package com.yxt.wms.biz.func.sysorganization;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 11:49
+ * @Description
+ */
+@Data
+public class SysOrganizationListQuery implements Query {
+    private static final long serialVersionUID = 8657016527420117948L;
+
+    private String userSid;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationListVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationListVo.java
new file mode 100644
index 0000000..911f488
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationListVo.java
@@ -0,0 +1,23 @@
+package com.yxt.wms.biz.func.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 11:42
+ * @Description
+ */
+@Data
+public class SysOrganizationListVo implements Vo {
+    private static final long serialVersionUID = -3709239161608411765L;
+
+    private String orgDeptSid;
+    private String orgDeptName;
+
+    private List<SysOrgStaffVo> staffinfoVoList;
+
+
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationListsVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationListsVo.java
new file mode 100644
index 0000000..462f72a
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationListsVo.java
@@ -0,0 +1,17 @@
+package com.yxt.wms.biz.func.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/30 11:28
+ * @Description
+ */
+@Data
+public class SysOrganizationListsVo implements Vo {
+    private static final long serialVersionUID = -7021974833444298712L;
+
+    private String orgDeptSid;
+    private String orgDeptName;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationMapper.java
new file mode 100644
index 0000000..2c203e5
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationMapper.java
@@ -0,0 +1,121 @@
+package com.yxt.wms.biz.func.sysorganization;
+
+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;
+import java.util.Map;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationMapper.java <br/>
+ * Class: SysOrganizationMapper <br/>
+ * Description: 组织机构表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
+
+    //@Update("update sys_organization set name=#{msg} where id=#{id}")
+    //IPage<SysOrganizationVo> voPage(IPage<SysOrganization> page, @Param(Constants.WRAPPER) QueryWrapper<SysOrganization> qw);
+
+    IPage<SysOrganizationVo> selectPageVo(IPage<SysOrganization> page, @Param(Constants.WRAPPER) Wrapper<SysOrganization> qw);
+
+    List<SysOrganizationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysOrganization> qw);
+
+    List<SysOrganizationVo> selectFirstOrgList();
+
+    List<SysOrganizationVo> selectChildrenListByPsid(@Param("psid") String psid);
+
+    @Select("SELECT * FROM sys_organization")
+    List<SysOrganizationVo> selectListVo();
+
+    @Select("SELECT name FROM sys_organization WHERE sid=#{sid}")
+    String selectOrgnameBySid(@Param("sid") String sid);
+
+    String selectOrgSidPath(@Param("sid") String sid);
+
+    List<AppContactSysOrganizationVo> selectAppOrganization();
+
+    List<AppContactSysOrganizationVo> selectAppOrganizationByPsid(@Param("psid") String psid);
+
+    List<SysOrgVo> treeList(String psid);
+
+    SysOrganization selectOrgCode();
+
+    List<SysOrgVo> getListOrg();
+
+    SysOrganization selectOrgCodeByPsid();
+
+    /**
+     * 根据上级sid查询组织的部门
+     *
+     * @param psid 上级sid
+     * @return
+     */
+    List<SysOrgListVo> selectTreeList(String psid);
+
+    /**
+     * 根据部门编码查询部门信息
+     *
+     * @param substring 部门编码
+     * @return
+     */
+    SysOrganization selectByOrgCode(String substring);
+
+    List<SysOrganizationVo> selectChildernList(String sid);
+
+//    /**
+//     * 根据业务员sid获取到分公司
+//     *
+//     * @param staffSid 业务员sid
+//     * @return
+//     */
+//    SysStaffOrgVo getUseOrgByUserSid(@Param("staffSid") String staffSid);
+
+    /**
+     * 根据sid判断是否是分公司并获取公司名称
+     *
+     * @param sid
+     * @return
+     */
+    SysOrganizationVo getUseOrgBySid(@Param("sid")String sid);
+
+    int updateQrCodePath(@Param("sid") String sid, @Param("path") String path);
+
+    QrCodeVo getQrCodeVo(@Param("sid") String sid);
+
+    @Select("select * from sys_organization WHERE staffSid=#{sid}")
+    SysOrganizationVo getUseOrgByStaffSid(String sid);
+
+    List<Map<String, String>> selectUseOrgSidBySid(String psid);
+
+    SysOrgVo getListOrgByBrand(String sid);
+
+    List<SysOrganizationListVo> selectOrgList(String orgSid);
+    List<SysOrganizationListsVo> selectOrgLists(String orgSid);
+
+    List<SysOrgStaffVo> selectByOrgDeptSid(String orgDeptSid);
+
+    SysOrganizationVo selectByPSid(@Param("sid") String sid, @Param("name") String name);
+
+    List<SysOrganizationVo> selectOrgSidList();
+
+    @Select("select * from sys_organization where orgSidPath = #{orgSidPath}")
+    SysOrganizationVo selectByOrgSidPath(String orgSidPath);
+
+    List<SysOrgVo> getListDeptByOrgSid(String orgSid);
+
+    List<SysOrganizationVo> selectOrgByPSid(String psid);
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationMapper.xml
new file mode 100644
index 0000000..0c98edb
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationMapper.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.sysorganization.SysOrganizationMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        SELECT so.*,
+               (SELECT GROUP_CONCAT(ss.name)
+                FROM `sys_staff_org` sso
+                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+                WHERE so.`sid` = sso.`orgSid`
+                  AND sso.manageType = '1') zgNames,
+               (SELECT GROUP_CONCAT(ss.sid)
+                FROM `sys_staff_org` sso
+                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+                WHERE so.`sid` = sso.`orgSid`
+                  AND sso.manageType = '1') zgSids,
+               (SELECT GROUP_CONCAT(ss.name)
+                FROM `sys_staff_org` sso
+                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+                WHERE so.`sid` = sso.`orgSid`
+                  AND sso.manageType = '2') fgNames,
+               (SELECT GROUP_CONCAT(ss.sid)
+                FROM `sys_staff_org` sso
+                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+                WHERE so.`sid` = sso.`orgSid`
+                  AND sso.manageType = '2') fgSids
+        FROM sys_organization so
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        GROUP BY so.`name`
+        ORDER BY so.sort
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        SELECT *
+        FROM sys_organization
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectFirstOrgList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        SELECT sid, name, psid, orgCode
+        FROM sys_organization
+        WHERE psid = '0'
+    </select>
+
+    <select id="selectChildrenListByPsid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        SELECT sid, name, psid, orgCode
+        FROM sys_organization
+        WHERE psid = #{psid}
+        ORDER BY sort ASC
+    </select>
+
+    <select id="selectOrgSidPath" resultType="java.lang.String">
+        SELECT orgSidPath
+        FROM sys_organization WHERE 1 = 1
+        <choose>
+            <when test="sid != null and sid != ''">
+                AND sid = #{sid,jdbcType=VARCHAR}
+            </when>
+            <otherwise>
+                AND psid = '0'
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="selectAppOrganization"
+            resultType="com.yxt.wms.biz.func.sysorganization.AppContactSysOrganizationVo">
+        SELECT sid,
+               name,
+               (SELECT count(1) FROM sys_staff_org WHERE orgSid = org.sid)                    staffNum,
+               IF((SELECT count(1) FROM sys_organization WHERE psid = org.sid) = 0, '2', '1') type
+        FROM sys_organization org
+        WHERE org.psid = (SELECT sid FROM sys_organization WHERE psid = '0')
+    </select>
+
+    <select id="selectAppOrganizationByPsid"
+            resultType="com.yxt.wms.biz.func.sysorganization.AppContactSysOrganizationVo">
+        SELECT org.sid,
+               org.name,
+               (SELECT count(1) FROM sys_staff_org WHERE orgSid = org.sid)                    staffNum,
+               IF((SELECT count(1) FROM sys_organization WHERE psid = org.sid) = 0, '2', '1') type
+        FROM sys_organization org
+        WHERE org.psid = #{psid}
+    </select>
+
+    <select id="treeList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgVo">
+        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath, so.orgCode
+        FROM sys_organization so
+        WHERE psid = #{psid}
+    </select>
+
+    <select id="selectOrgCode" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganization">
+        SELECT *
+        FROM sys_organization
+        WHERE psid = '0'
+    </select>
+
+    <select id="getListOrg" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgVo">
+        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
+        FROM sys_organization so
+        WHERE isDept = 0
+        ORDER BY psid
+    </select>
+
+    <select id="selectOrgCodeByPsid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganization">
+        SELECT *
+        FROM sys_organization
+        LIMIT 0,1
+    </select>
+
+    <select id="selectTreeList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgListVo">
+        SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
+        FROM sys_organization so
+        WHERE psid = #{psid}
+    </select>
+    <!--根据部门编码查询部门信息-->
+    <select id="selectByOrgCode" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganization">
+        select *
+        from sys_organization
+        where orgCode = #{substring}
+    </select>
+
+    <select id="selectChildernList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
+        FROM sys_organization so
+        WHERE psid = #{psid}
+        ORDER BY so.sort ASC
+    </select>
+
+<!--    <select id="getUseOrgByUserSid" resultType="com.yxt.wms.biz.func.sysstafforg.SysStaffOrgVo">-->
+<!--        select orgSidPath-->
+<!--        from sys_staff_org-->
+<!--        where staffSid = #{staffSid}-->
+<!--    </select>-->
+
+    <select id="getUseOrgBySid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
+        FROM sys_organization so
+        WHERE sid = #{sid}
+          And isDept = 0
+    </select>
+
+    <update id="updateQrCodePath">
+        UPDATE sys_organization
+        SET qrText = #{path}
+        WHERE sid = #{sid}
+    </update>
+
+    <select id="getQrCodeVo" resultType="com.yxt.wms.biz.func.sysorganization.QrCodeVo">
+        SELECT so.name departmentName, so.qrText qrFilePath, so.addrs address, so.sid
+        FROM sys_organization so
+        WHERE so.sid = #{sid}
+        ORDER BY so.sort ASC
+    </select>
+
+    <select id="selectUseOrgSidBySid" resultType="java.util.Map">
+        SELECT sid,
+               name
+        FROM sys_organization
+        WHERE psid = #{psid}
+          AND isDelete = 0
+          AND isDept = 0
+    </select>
+
+    <select id="getListOrgByBrand" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgVo">
+        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
+        FROM sys_organization so
+        WHERE isDept = 0
+          AND so.sid = #{sid}
+        ORDER BY psid
+    </select>
+
+    <select id="selectOrgList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationListVo">
+        select so.name orgDeptName, so.sid orgDeptSid
+        from sys_organization so
+        where so.psid = #{orgSid}
+          and orgAttributeKey = 'DP03_SYS'
+    </select>
+
+    <select id="selectOrgLists" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationListsVo">
+        select so.name orgDeptName, so.sid orgDeptSid
+        from sys_organization so
+        where so.psid = #{orgSid}
+    </select>
+
+    <select id="selectByOrgDeptSid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgStaffVo">
+        select distinct si.name staffName, si.sid staffSid
+        from sys_staff_org so
+                 left join sys_staffinfo si on so.staffSid = si.sid
+        where so.orgSid = #{orgDeptSid}
+    </select>
+
+    <select id="selectByPSid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        select *
+        from sys_organization
+        where psid = #{sid}
+          and name = #{name}
+    </select>
+
+    <select id="selectOrgSidList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        select sid,name,orgCode from sys_organization so where so.isDept = 0
+    </select>
+
+    <select id="getListDeptByOrgSid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgVo">
+        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
+        FROM sys_organization so
+        WHERE isDept = 1
+          AND so.psid = #{orgSid}
+    </select>
+
+    <select id="selectOrgByPSid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
+        FROM sys_organization so
+        WHERE isDept = 0 AND so.psid = #{psid}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationQuery.java
new file mode 100644
index 0000000..563b81a
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationQuery.java
@@ -0,0 +1,58 @@
+package com.yxt.wms.biz.func.sysorganization;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationQuery.java <br/>
+ * Class: SysOrganizationQuery <br/>
+ * Description: 组织机构表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "组织机构表 查询条件", description = "组织机构表 查询条件")
+@Data
+public class SysOrganizationQuery implements Query {
+
+    
+	@ApiModelProperty("部门/组织名称")
+    private String name;
+    
+	@ApiModelProperty("父(部门/组织) sid")
+    private String psid;
+    
+	@ApiModelProperty("联系电话")
+    private String linkPhone;
+	@ApiModelProperty("联系人")
+    private String linkPerson;
+
+	@ApiModelProperty("部门sid全路径")
+    private String orgSidPath;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("地址")
+    private String addrs;
+    
+	@ApiModelProperty("地理位置经纬度")
+    private String jwd;
+    
+	@ApiModelProperty("二维码")
+    private String qrText;
+    
+	@ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己")
+    private Integer limitOrgMember;
+    
+	@ApiModelProperty("部门编码")
+    private String orgCode;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationService.java
new file mode 100644
index 0000000..9183bfb
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationService.java
@@ -0,0 +1,253 @@
+package com.yxt.wms.biz.func.sysorganization;
+
+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.config.RedisUtil;
+import com.yxt.common.base.config.component.FileUploadComponent;
+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.wms.feign.portal.sysorganization.SysOrganizationFeign;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.*;
+
+import static java.util.stream.Collectors.toList;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationService.java <br/>
+ * Class: SysOrganizationService <br/>
+ * Description: 组织机构表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SysOrganizationService extends MybatisBaseService<SysOrganizationMapper, SysOrganization> {
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Autowired
+    SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private RedisUtil redisUtil;
+
+    public ResultBean saveOrg(SysOrganizationDto dto){
+        return sysOrganizationFeign.saveOrg(dto);
+    }
+
+    public PagerVo<SysOrganization> listPage(PagerQuery<SysOrganizationQuery> pq) {
+        SysOrganizationQuery query = pq.getParams();
+        QueryWrapper<SysOrganization> qw = createQueryWrapper(query);
+        IPage<SysOrganization> page = PagerUtil.queryToPage(pq);
+        IPage<SysOrganization> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<SysOrganization> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<SysOrganization> listAll(SysOrganizationQuery query) {
+        QueryWrapper<SysOrganization> qw = createQueryWrapper(query);
+        return baseMapper.selectList(qw);
+    }
+
+    private QueryWrapper<SysOrganization> createQueryWrapper(SysOrganizationQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<SysOrganization> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.eq("name", query.getName());
+        }
+
+        if (StringUtils.isNotBlank(query.getPsid())) {
+            qw.eq("psid", query.getPsid());
+        }
+
+        if (StringUtils.isNotBlank(query.getLinkPhone())) {
+            qw.eq("linkPhone", query.getLinkPhone());
+        }
+
+        if (StringUtils.isNotBlank(query.getOrgSidPath())) {
+            qw.eq("orgSidPath", query.getOrgSidPath());
+        }
+
+        if (query.getSort() != null) {
+            qw.eq("sort", query.getSort());
+        }
+
+        if (StringUtils.isNotBlank(query.getAddrs())) {
+            qw.eq("addrs", query.getAddrs());
+        }
+
+        if (StringUtils.isNotBlank(query.getJwd())) {
+            qw.eq("jwd", query.getJwd());
+        }
+
+        if (StringUtils.isNotBlank(query.getQrText())) {
+            qw.eq("qrText", query.getQrText());
+        }
+
+        if (query.getLimitOrgMember() != null) {
+            qw.eq("limitOrgMember", query.getLimitOrgMember());
+        }
+
+        if (StringUtils.isNotBlank(query.getOrgCode())) {
+            qw.eq("orgCode", query.getOrgCode());
+        }
+        return qw;
+    }
+
+    public ResultBean<PagerVo<SysOrganizationVo>> listPageVo(PagerQuery<SysOrganizationQuery> pq) {
+        return sysOrganizationFeign.listPage(pq);
+    }
+
+    public ResultBean<List<SysOrganizationVo>> listAllVo(SysOrganizationQuery query) {
+
+        return sysOrganizationFeign.listAll(query);
+    }
+
+    public ResultBean<List<SysOrganizationVo>> listVo() {
+        return sysOrganizationFeign.list();
+    }
+
+
+    public ResultBean<List<SysOrganizationVo>> selectFirstOrgList() {
+        return sysOrganizationFeign.selectFirstOrgList();
+    }
+
+    public ResultBean<List<SysOrganizationVo>> selectChildrenListBySid(String sid) {
+        return sysOrganizationFeign.selectChildrenListBySid(sid);
+    }
+    public ResultBean updateBySid(SysOrganizationDto dto, String sid) {
+        return sysOrganizationFeign.update(dto, sid);
+    }
+    public ResultBean del(String sid) {
+        return sysOrganizationFeign.del(sid);
+    }
+    public ResultBean deIds(String sid) {
+        return sysOrganizationFeign.delBySid(sid);
+    }
+
+
+    public ResultBean saveOrUpdateDto(SysOrganizationDto dto) {
+        return sysOrganizationFeign.save(dto);
+    }
+
+    public ResultBean<SysOrganizationVo> fetchByIdVo(String id) {
+        return sysOrganizationFeign.fetch(id);
+    }
+    public ResultBean<SysOrganizationVo> fetchBySidVo(String id) {
+        return sysOrganizationFeign.fetchBySid(id);
+    }
+
+
+
+    public ResultBean<Map<String, Object>> selectAppOrganization(String sid) {
+        return sysOrganizationFeign.selectAppOrganization(sid);
+    }
+
+
+
+
+
+    /**
+     * @param
+     * @description: 获取组织架构即使用组织下拉框
+     * @return:
+     * @Author: dimengzhe
+     * @Date: 2021/10/12 21:47
+     */
+    public ResultBean<List<SysOrgVo>> treeList() {
+        return sysOrganizationFeign.selectListOrg();
+    }
+
+
+
+    public ResultBean<List<SysOrgVo>> getListOrg() {
+        return sysOrganizationFeign.getListOrg();
+    }
+
+
+    /**
+     * 查询所有部门列表
+     *
+     * @return
+     */
+    public ResultBean<List<SysOrgListVo>> selectListOne() {
+
+        return sysOrganizationFeign.selectListOne();
+
+    }
+
+    /**
+     * 根据业务员sid获取到分公司
+     *
+     * @param userSid 业务员sid
+     * @return
+     */
+    public SysOrganizationVo getUseOrgByUserSid(String userSid) {
+
+        return new SysOrganizationVo();
+    }
+    public ResultBean<SysOrganization> selectBySid(String userSid) {
+        return sysOrganizationFeign.selectBySid(userSid);
+    }
+
+
+    public ResultBean<QrCodeVo> getQrCode(String sid) {
+        return sysOrganizationFeign.getQrCode(sid);
+    }
+
+
+
+    public ResultBean<List<Map<String, String>>> selectUseOrgSidBySid(String sid) {
+        return sysOrganizationFeign.selectUseOrgSidBySid(sid);
+    }
+
+    public ResultBean<String> getOrgSid(String sid) {
+        return sysOrganizationFeign.getOrgSid(sid);
+    }
+
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
+        return sysOrganizationFeign.selectOrgList(query);
+    }
+
+    public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
+        return sysOrganizationFeign.selectOrgLists(query);
+
+    }
+
+    public ResultBean<SysOrganizationVo> selectByPSid(String sid, String name) {
+
+        return sysOrganizationFeign.selectByPSid(sid, name);
+    }
+
+    public ResultBean<List<SysOrganizationVo>> selectOrgSidList() {
+        return sysOrganizationFeign.selectOrgSidList();
+    }
+
+    public ResultBean<SysOrganizationVo> selectByOrgSidPath(String orgSidPath) {
+        return sysOrganizationFeign.selectByOrgSidPath(orgSidPath);
+    }
+
+    public ResultBean<List<SysOrgVo>> getListDeptByOrgSid(String orgSid) {
+        return sysOrganizationFeign.getListDeptByOrgSid(orgSid);
+    }
+
+    public ResultBean<List<SysOrganizationVo>> selectOrgByPSid(String psid) {
+
+        return sysOrganizationFeign.selectOrgByPSid(psid);
+    }
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationVo.java
new file mode 100644
index 0000000..bd74cf2
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysorganization/SysOrganizationVo.java
@@ -0,0 +1,86 @@
+package com.yxt.wms.biz.func.sysorganization;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationVo.java <br/>
+ * Class: SysOrganizationVo <br/>
+ * Description: 组织机构表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "组织机构表 视图数据对象", description = "组织机构表 视图数据对象")
+@Data
+public class SysOrganizationVo implements Vo {
+    @ApiModelProperty("部门/组织名称")
+    private String name;
+    
+	@ApiModelProperty("父(部门/组织) sid")
+    private String psid;
+    
+	@ApiModelProperty("联系电话")
+    private String linkPhone;
+
+	@ApiModelProperty("联系人")
+    private String linkPerson;
+
+	@ApiModelProperty("部门sid全路径")
+    private String orgSidPath;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("地址")
+    private String addrs;
+    
+	@ApiModelProperty("地理位置经纬度")
+    private String jwd;
+    
+	@ApiModelProperty("二维码")
+    private String qrText;
+    
+	@ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己")
+    private Integer limitOrgMember;
+    
+	@ApiModelProperty("部门编码")
+    private String orgCode;
+	@ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("子集")
+	private List<SysOrganizationVo> children = new ArrayList<>();
+    @ApiModelProperty("主管人员名称")
+    private String zgNames;
+    @ApiModelProperty("分管人员名称")
+    private String fgNames;
+    @ApiModelProperty("主管人员sid")
+    private String zgStaffSid;
+    @ApiModelProperty("分管人员sid")
+    private String fgStaffSid;
+    @ApiModelProperty("组织简称")
+    private String orgAbbre;
+    @ApiModelProperty("是否是部门(0否，1是)")
+    private Integer isDept;
+    @ApiModelProperty("组织属性key")
+    private String orgAttributeKey;
+    @ApiModelProperty("组织属性value")
+    private String orgAttributeValue;
+    @ApiModelProperty("管理层级key")
+    private String orgLevelKey;
+    @ApiModelProperty("管理层级value")
+    private String orgLevelValue;
+    @ApiModelProperty("其他编码")
+    private String otherCode;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPost.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPost.java
new file mode 100644
index 0000000..6f0523e
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPost.java
@@ -0,0 +1,46 @@
+package com.yxt.wms.biz.func.syspost;
+
+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: anrui_portal(门户建设) <br/>
+ * File: SysPost.java <br/>
+ * Class: com.yxt.anrui.portal.api.syspost.SysPost <br/>
+ * Description: 岗位. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "岗位", description = "岗位")
+@TableName("sys_post")
+@Data
+public class SysPost extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty("岗位名称")
+    private String name;
+
+    @ApiModelProperty("职级key")
+    private String postLevelKey;
+
+    @ApiModelProperty("职级")
+    private String postLevel;
+
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+
+//    @ApiModelProperty("所属部门sid")
+//    private String orgSid;
+
+    @ApiModelProperty(value = "父级sid")
+    private String parentSid;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostDto.java
new file mode 100644
index 0000000..9b5a29d
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostDto.java
@@ -0,0 +1,44 @@
+package com.yxt.wms.biz.func.syspost;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPostDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostDto <br/>
+ * Description: 岗位 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "岗位 数据传输对象", description = "岗位 数据传输对象")
+@Data
+public class SysPostDto implements Dto {
+
+    private static final long serialVersionUID = 863876947510030464L;
+    @ApiModelProperty("岗位名称")
+    private String name;
+
+    @ApiModelProperty("职级key")
+    private String postLevelKey;
+
+    @ApiModelProperty("职级")
+    private String postLevel;
+
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+
+//    @ApiModelProperty("所属部门sid")
+//    private String orgSid;
+
+    @ApiModelProperty(value = "父级sid", example = "0")
+    private String parentSid;
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostListVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostListVo.java
new file mode 100644
index 0000000..09ea9db
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostListVo.java
@@ -0,0 +1,22 @@
+package com.yxt.wms.biz.func.syspost;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/14 13:49
+ * @Description 部门下的岗位信息
+ */
+@Data
+public class SysPostListVo implements Vo {
+    private static final long serialVersionUID = -8060032905868283959L;
+
+    @ApiModelProperty("岗位名称")
+    private String name;
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+    @ApiModelProperty("岗位sid")
+    private String sid;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostMapper.java
new file mode 100644
index 0000000..d33efa5
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostMapper.java
@@ -0,0 +1,65 @@
+package com.yxt.wms.biz.func.syspost;
+
+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: anrui_portal(门户建设) <br/>
+ * File: SysPostMapper.java <br/>
+ * Class: com.yxt.anrui.portal.biz.syspost.SysPostMapper <br/>
+ * Description: 岗位. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SysPostMapper extends BaseMapper<SysPost> {
+
+    //@Update("update sys_post set name=#{msg} where id=#{id}")
+    //IPage<SysPostVo> voPage(IPage<SysPost> page, @Param(Constants.WRAPPER) QueryWrapper<SysPost> qw);
+
+    IPage<SysPostVo> selectPageVo(IPage<SysPost> page, @Param(Constants.WRAPPER) Wrapper<SysPost> qw);
+
+    List<SysPostVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysPost> qw);
+
+    @Select("select * from sys_post")
+    List<SysPostVo> selectListVo();
+
+    @Select("select * from sys_post where sid=#{sid} ")
+    SysPost fetchBySid(@Param("sid") String sid);
+
+    @Select("select * from sys_post where orgSid=#{orgSid} ")
+    List<SysPostVo> fetchByOrgSid(@Param("orgSid") String orgSid);
+
+    @Select("select postCode,`name` from sys_post")
+    List<SysPostVo> fetchByOrgSidPostCode();
+
+    /**
+     * 查询所有岗位列表
+     *
+     * @return
+     */
+    List<SysPostListVo> selectListOne();
+
+    /**
+     * 根据岗位编码查询岗位信息
+     *
+     * @param substring 岗位编码
+     * @return
+     */
+    SysPost selectByPostCode(String substring);
+
+    @Select("select * from sys_post where staffSid = #{sid}")
+    SysPost getPostByStaffSid(String sid);
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostMapper.xml
new file mode 100644
index 0000000..91338b8
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.syspost.SysPostMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.syspost.SysPostVo">
+        SELECT post.sid                                                                            sid,
+               post.name                                                                           name,
+               post.orgSid,
+               post.postCode,
+               post.postLevelKey,
+               post.postLevel,
+               post.orgSid,
+               IF(org.psid = '0', org.name,
+                  CONCAT((select name from sys_organization where sid = org.psid), "/", org.name)) orgName,
+               post.parentSid,
+               sp.name                                                                             parentName
+        FROM sys_post post
+                 left join sys_organization org on org.sid = post.orgSid
+                 left join sys_post sp on post.parentSid = sp.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.syspost.SysPostVo">
+        SELECT *
+        FROM sys_post
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <!--根据部门sid查询该部门下的所有岗位列表-->
+    <select id="selectListOne" resultType="com.yxt.wms.biz.func.syspost.SysPostListVo">
+        select name, postCode, sid
+        from sys_post
+    </select>
+    <!--根据岗位编码查询岗位信息-->
+    <select id="selectByPostCode" resultType="com.yxt.wms.biz.func.syspost.SysPost">
+        select *
+        from sys_post
+        where postCode = #{substring}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostQuery.java
new file mode 100644
index 0000000..4c42e98
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostQuery.java
@@ -0,0 +1,41 @@
+package com.yxt.wms.biz.func.syspost;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPostQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostQuery <br/>
+ * Description: 岗位 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "岗位 查询条件", description = "岗位 查询条件")
+@Data
+public class SysPostQuery implements Query {
+
+    
+	@ApiModelProperty("岗位名称")
+    private String name;
+
+    @ApiModelProperty("职级key")
+    private String postLevelKey;
+
+    @ApiModelProperty("职级")
+    private String postLevel;
+
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+    
+	@ApiModelProperty("所属部门sid")
+    private String orgSid;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostService.java
new file mode 100644
index 0000000..003a6fd
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostService.java
@@ -0,0 +1,131 @@
+package com.yxt.wms.biz.func.syspost;
+
+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.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.feign.portal.syspost.SysPostFeign;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPostService.java <br/>
+ * Class: com.yxt.user.biz.syspost.SysPostService <br/>
+ * Description: 岗位 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SysPostService extends MybatisBaseService<SysPostMapper, SysPost> {
+
+
+    @Autowired
+    SysPostFeign sysPostFeign;
+
+    public PagerVo<SysPost> listPage(PagerQuery<SysPostQuery> pq) {
+        SysPostQuery query = pq.getParams();
+        QueryWrapper<SysPost> qw = createQueryWrapper(query);
+        IPage<SysPost> page = PagerUtil.queryToPage(pq);
+        IPage<SysPost> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<SysPost> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<SysPost> listAll(SysPostQuery query) {
+        QueryWrapper<SysPost> qw = createQueryWrapper(query);
+        return baseMapper.selectList(qw);
+    }
+
+    private QueryWrapper<SysPost> createQueryWrapper(SysPostQuery query) {
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<SysPost> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("post.name", query.getName());
+        }
+
+        if (StringUtils.isNotBlank(query.getOrgSid())) {
+            qw.eq("post.orgSid", query.getOrgSid());
+        }
+        return qw;
+    }
+
+    public ResultBean<PagerVo<SysPostVo>> listPageVo(PagerQuery<SysPostQuery> pq) {
+        return sysPostFeign.listPage(pq);
+    }
+
+    public ResultBean<List<SysPostVo>> listAllVo(SysPostQuery query) {
+        return sysPostFeign.listAll(query);
+    }
+
+    public ResultBean<List<SysPostVo>> listVo() {
+        return sysPostFeign.list();
+    }
+
+    public ResultBean saveOrUpdateDto(SysPostDto dto) {
+        return sysPostFeign.save(dto);
+    }
+    public ResultBean updateBySid(SysPostDto dto,String sid) {
+        return sysPostFeign.update(dto,sid);
+    }
+    public ResultBean del(String sid) {
+        return sysPostFeign.del(sid);
+    }
+    public ResultBean delBySids(String sid) {
+        return sysPostFeign.delBySids(sid);
+    }
+
+    public ResultBean<SysPostVo> fetchByIdVo(String id) {
+        return sysPostFeign.fetch(id);
+    }
+
+    public ResultBean<SysPostVo> fetchBySidVo(String sid) {
+        return sysPostFeign.fetchBySid(sid);
+    }
+
+    public ResultBean<List<SysPostVo>> fetchByOrgSid(String orgSid) {
+        return sysPostFeign.fetchByOrgSid(orgSid);
+    }
+
+    public ResultBean<String> fetchByOrgSidPostCode() {
+        return sysPostFeign.fetchByOrgSidPostCode();
+    }
+
+    /**
+     * 查询所有岗位列表
+     *
+     * @return
+     */
+    public  ResultBean<List<SysPostListVo>> selectList() {
+
+        return sysPostFeign.selectList();
+    }
+
+    /**
+     * 根据岗位编码查询岗位信息
+     *
+     * @param substring 岗位编码
+     * @return
+     */
+    public SysPost selectByPostCode(String substring) {
+        return baseMapper.selectByPostCode(substring);
+    }
+
+    public SysPost getPostByStaffSid(String sid) {
+        return baseMapper.getPostByStaffSid(sid);
+    }
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostVo.java
new file mode 100644
index 0000000..7d73b29
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/syspost/SysPostVo.java
@@ -0,0 +1,52 @@
+package com.yxt.wms.biz.func.syspost;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPostVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostVo <br/>
+ * Description: 岗位 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "岗位 视图数据对象", description = "岗位 视图数据对象")
+@Data
+public class SysPostVo implements Vo {
+
+    
+	@ApiModelProperty("岗位名称")
+    private String name;
+
+    @ApiModelProperty("职级key")
+    private String postLevelKey;
+
+    @ApiModelProperty("职级")
+    private String postLevel;
+
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+    
+	@ApiModelProperty("所属部门sid")
+    private String orgSid;
+
+	@ApiModelProperty("所属部门名称")
+    private String orgName;
+
+    @ApiModelProperty("岗位sid")
+    private String sid;
+
+    @ApiModelProperty(value = "上级岗位名称")
+    private String parentName;
+    @ApiModelProperty(value = "上级岗位sid")
+    private String parentSid;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRole.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRole.java
new file mode 100644
index 0000000..30c6400
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRole.java
@@ -0,0 +1,48 @@
+package com.yxt.wms.biz.func.sysrole;
+
+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: anrui_portal(门户建设) <br/>
+ * File: SysRole.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRole <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "角色", description = "角色")
+@TableName("sys_role")
+@Data
+public class SysRole extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("角色名称")
+    private String name;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("编码")
+    private String code;
+    
+	@ApiModelProperty("1、系统管理员、2、普通角色")
+    private Integer type;
+
+    @ApiModelProperty("岗位sid")
+    private String postSid;
+
+    @ApiModelProperty(value = "角色组织层级key")
+    private String roleType;
+    @ApiModelProperty(value = "角色组织层级value")
+    private String roleTypeValue;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleDto.java
new file mode 100644
index 0000000..9079b30
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleDto.java
@@ -0,0 +1,51 @@
+package com.yxt.wms.biz.func.sysrole;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleDto <br/>
+ * Description: 角色 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "角色 数据传输对象", description = "角色 数据传输对象")
+@Data
+public class SysRoleDto implements Dto {
+
+    
+	@ApiModelProperty("角色名称")
+    private String name;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("编码")
+    private String code;
+	@ApiModelProperty("备注")
+    private String remarks;
+
+	@ApiModelProperty("1、系统管理员、2、普通角色")
+    private Integer type;
+
+    @ApiModelProperty("岗位sid")
+    private String postSid;
+
+    @ApiModelProperty("岗位名称")
+    private String postName;
+
+    @ApiModelProperty(value = "角色组织层级key")
+    private String roleType;
+    @ApiModelProperty(value = "角色组织层级value")
+    private String roleTypeValue;
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleMapper.java
new file mode 100644
index 0000000..4790f84
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleMapper.java
@@ -0,0 +1,68 @@
+package com.yxt.wms.biz.func.sysrole;
+
+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: anrui_portal(门户建设) <br/>
+ * File: SysRoleMapper.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysrole.SysRoleMapper <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SysRoleMapper extends BaseMapper<SysRole> {
+
+	//@Update("update sys_role set name=#{msg} where id=#{id}")
+	//IPage<SysRoleVo> voPage(IPage<SysRole> page, @Param(Constants.WRAPPER) QueryWrapper<SysRole> qw);
+	
+	IPage<SysRoleVo> selectPageVo(IPage<SysRole> page, @Param(Constants.WRAPPER) Wrapper<SysRole> qw);
+
+	List<SysRoleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysRole> qw);
+
+	@Select("select * from sys_role")
+	List<SysRoleVo> selectListVo();
+
+	List<SysRoleVo> fetchByUserSid(String userSid);
+
+	List<SysRoleVo> listAllByUserSid(String userSid);
+
+	SysRole fetchByName(String name);
+
+	int deleteBatchSids(List<String> list);
+
+	int deleteBySid(String valueOf);
+
+	SysRoleVo fetchBySid(String sid);
+
+	int updateIsEnable(@Param("sid") String sid, @Param("isEnable") String isEnable);
+
+    String getLevelType(String roleSid);
+
+    String selectRoleSid(String userRoleSid);
+
+    String selectByUserSid(String sid);
+
+	List<String> selectByUser(String userSid);
+
+//    List<SysMenuRoleVoList> selectRoleList(String menuSid);
+//
+//    List<SysMenuRoleVoList> selectMobileRoleList(String menuSid);
+
+	List<String> selectByRole(@Param("list") List<String> roleSidList, @Param("menuSid") String menuSid,@Param("userSid") String userSid);
+
+    List<String> selectByMobileRole(@Param("list") List<String> roleSidList, @Param("menuSid") String menuSid,@Param("userSid") String userSid);
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleMapper.xml
new file mode 100644
index 0000000..c9b483b
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleMapper.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.sysrole.SysRoleMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+        SELECT sr.*, sp.sid as postSid, sp.name as postName
+        FROM sys_role sr
+                 LEFT JOIN sys_post sp ON sr.postSid = sp.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        ORDER BY sr.sort
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+        SELECT *
+        FROM sys_role
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="listAllByUserSid" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+        SELECT role.name, role.sid, ISNULL(userRole.sid) AS checked
+        FROM sys_role role
+                 LEFT JOIN sys_user_role userRole ON role.sid = userRole.`roleSid`
+            AND userRole.userSid = #{param1}
+    </select>
+
+    <select id="fetchByUserSid" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+        SELECT role.name, role.remarks, role.sid
+        FROM sys_role role
+                 left join sys_user_role userrole on userrole.roleSid = role.sid
+        where userrole.userSid = #{param1}
+    </select>
+    <select id="fetchByName" resultType="com.yxt.wms.biz.func.sysrole.SysRole">
+        SELECT *
+        FROM sys_role role
+        where role.name = #{param1}
+    </select>
+    <select id="fetchBySid" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+        SELECT role.*, post.sid as postSid, post.name as postName
+        FROM sys_role role
+                 LEFT JOIN sys_post post ON role.postSid = post.sid
+        WHERE role.sid = #{param1}
+    </select>
+    <delete id="deleteBatchSids" parameterType="String">
+        DELETE
+        FROM sys_role WHERE sid IN
+        <foreach collection="list" item="sid" open="(" separator="," close=")">
+            #{sid}
+        </foreach>
+    </delete>
+    <delete id="deleteBySid">
+        DELETE
+        FROM sys_role
+        WHERE sid = #{sid}
+    </delete>
+
+    <update id="updateIsEnable">
+        UPDATE sys_role
+        SET isEnable = #{isEnable}
+        WHERE sid = #{sid}
+    </update>
+
+    <select id="getLevelType" resultType="java.lang.String">
+        select roleType
+        from sys_role
+        where sid = #{roleSid}
+    </select>
+
+    <select id="selectRoleSid" resultType="java.lang.String">
+        SELECT ssr.sid
+        FROM sys_role sr
+                 LEFT JOIN sys_post sp ON sp.sid = sr.postSid
+                 left join sys_post ssp on sp.parentSid = ssp.sid
+                 left join sys_role ssr on ssp.sid = ssr.postSid
+        where sr.sid = #{sid}
+    </select>
+
+    <select id="selectByUserSid" resultType="java.lang.String">
+        select GROUP_CONCAT(sr.name SEPARATOR '|') as roleName
+        from sys_user_role sur
+                 left join sys_role sr on sur.roleSid = sr.sid
+        where sur.userSid = #{sid}
+    </select>
+
+    <select id="selectByUser" resultType="java.lang.String">
+        select roleSid
+        from sys_user_role
+        where userSid = #{userSid}
+    </select>
+
+<!--    <select id="selectRoleList" resultType="com.yxt.wms.biz.sysuser.SysMenuRoleVoList">-->
+<!--        select sr.sid roleSid, sr.name roleName, sr.roleType, sr.roleTypeValue,smr.dataRuleId-->
+<!--        from sys_role sr-->
+<!--                 left join sys_menu_role smr on sr.sid = smr.roleSid-->
+<!--        where smr.menuSid = #{menuSid}-->
+<!--    </select>-->
+
+<!--    <select id="selectMobileRoleList" resultType="com.yxt.wms.biz.sysuser.SysMenuRoleVoList">-->
+<!--        select sr.sid roleSid, sr.name roleName, sr.roleType, sr.roleTypeValue-->
+<!--        from sys_role sr-->
+<!--                 left join sys_mobile_menu_role smr on sr.sid = smr.roleSid-->
+<!--        where smr.menuSid = #{menuSid}-->
+<!--    </select>-->
+
+    <select id="selectByRole" resultType="java.lang.String">
+        select smr.dataRuleId from sys_menu_role smr
+        left join sys_menu sm on sm.sid = smr.menuSid
+        left join sys_role sr on sr.sid = smr.roleSid
+        left join sys_user_role sur on sur.roleSid = smr.roleSid
+        where smr.menuSid = #{menuSid} and sur.userSid = #{userSid} and sr.sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and length(smr.dataRuleId)>0
+        order by dataRuleId asc
+    </select>
+
+    <select id="selectByMobileRole" resultType="java.lang.String">
+        select smr.dataRuleId from sys_mobile_menu_role smr
+        left join sys_mobile_menu sm on sm.sid = smr.menuSid
+        left join sys_role sr on sr.sid = smr.roleSid
+        left join sys_user_role sur on sur.roleSid = smr.roleSid
+        where smr.menuSid = #{menuSid} and sur.userSid = #{userSid}
+        and sr.sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and length(smr.dataRuleId)>0
+        order by dataRuleId asc
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleQuery.java
new file mode 100644
index 0000000..4cd224b
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleQuery.java
@@ -0,0 +1,38 @@
+package com.yxt.wms.biz.func.sysrole;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleQuery <br/>
+ * Description: 角色 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "角色 查询条件", description = "角色 查询条件")
+@Data
+public class SysRoleQuery implements Query {
+
+    
+	@ApiModelProperty("角色名称")
+    private String name;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("编码")
+    private String code;
+    
+	@ApiModelProperty("1、系统管理员、2、普通角色")
+    private Integer type;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleService.java
new file mode 100644
index 0000000..446a1e7
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleService.java
@@ -0,0 +1,131 @@
+package com.yxt.wms.biz.func.sysrole;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysuserrole.SysUserRoleService;
+import com.yxt.wms.feign.portal.sysrole.SysRoleFeign;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleService.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysrole.SysRoleService <br/>
+ * Description: 角色 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
+    @Autowired
+    private SysUserRoleService sysUserRoleService;
+    @Autowired
+    SysRoleFeign sysRoleFeign;
+
+
+    public ResultBean<PagerVo<SysRoleVo>> listPage(PagerQuery<SysRoleQuery> pq) {
+        return sysRoleFeign.listPage(pq);
+    }
+
+    public ResultBean<List<SysRoleVo>> listAll(SysRoleQuery query) {
+        return sysRoleFeign.listAll(query);
+    }
+
+    private QueryWrapper<SysRole> createQueryWrapper(SysRoleQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<SysRole> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("sr.name", query.getName());
+        }
+
+        if (query.getSort() != null) {
+            qw.eq("sr.sort", query.getSort());
+        }
+
+        if (StringUtils.isNotBlank(query.getCode())) {
+            qw.eq("sr.code", query.getCode());
+        }
+
+        if (query.getType() != null) {
+            qw.eq("sr.type", query.getType());
+        }
+        return qw;
+    }
+
+    public ResultBean<PagerVo<SysRoleVo>> listPageVo(PagerQuery<SysRoleQuery> pq) {
+        return sysRoleFeign.listPage(pq);
+    }
+
+    public ResultBean<List<SysRoleVo>> listAllVo(SysRoleQuery query) {
+        return sysRoleFeign.listAll(query);
+    }
+
+    public ResultBean<List<SysRoleVo>> listVo() {
+        return sysRoleFeign.list();
+    }
+
+    public ResultBean saveOrUpdateDto(SysRoleDto dto) {
+        return sysRoleFeign.save(dto);
+    }
+    public ResultBean updateBySid(SysRoleDto dto,String sid) {
+        return sysRoleFeign.update(dto,sid);
+    }
+    public ResultBean<SysRoleVo> fetchByIdVo(String id) {
+        return sysRoleFeign.fetch(id);
+    }
+
+    public ResultBean<List<SysRoleVo>> fetchByUserSid(String userSid) {
+        return sysRoleFeign.fetchByUserSid(userSid);
+    }
+
+    public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid) {
+        return sysRoleFeign.listAllByUserSid(userSid);
+    }
+
+    /**
+     * 描述 : <描述函数实现的功能>. <br/>
+     * <p>
+     *
+     * @param sids
+     * @return
+     */
+    public ResultBean delBySid(String sids) {
+        return sysRoleFeign.delBySids(sids);
+    }
+    /**
+     * 描述 : <描述函数实现的功能>. <br/>
+     * <p>
+     *
+     * @param sids
+     * @return
+     */
+    public ResultBean del(String sids) {
+        return sysRoleFeign.del(sids);
+    }
+
+    public ResultBean<SysRoleVo> fetchBySidVo(String sid) {
+        return sysRoleFeign.fetchBySid(sid);
+    }
+    public ResultBean<SysRoleVo> updateIsEnable(String sid, String isEnable) {
+        return sysRoleFeign.setIsEnable(sid,isEnable);
+    }
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleVo.java
new file mode 100644
index 0000000..1092531
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleVo.java
@@ -0,0 +1,47 @@
+package com.yxt.wms.biz.func.sysrole;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleVo <br/>
+ * Description: 角色 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "角色 视图数据对象", description = "角色 视图数据对象")
+@Data
+public class SysRoleVo implements Vo {
+	@ApiModelProperty("角色名称")
+    private String name;
+    @ApiModelProperty("排序")
+    private Integer sort;
+    @ApiModelProperty("编码")
+    private String code;
+    @ApiModelProperty("1、系统管理员、2、普通角色")
+    private Integer type;
+	@ApiModelProperty("角色sid")
+    private String sid;
+	@ApiModelProperty("说明")
+    private String remarks;
+	@ApiModelProperty("是否选中，1：未选中,0：选中")
+    private String checked;
+	@ApiModelProperty("是否可用")
+    private String isEnable;
+    @ApiModelProperty("岗位sid")
+    private String postSid;
+    @ApiModelProperty("岗位名称")
+    private String postName;
+    @ApiModelProperty(value = "组织层级")
+    private String roleTypeValue;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/sysuser/SysUserService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuser/SysUserService.java
similarity index 66%
rename from wms-biz/src/main/java/com/yxt/wms/biz/sysuser/SysUserService.java
rename to wms-biz/src/main/java/com/yxt/wms/biz/func/sysuser/SysUserService.java
index c94f7ca..87ff16f 100644
--- a/wms-biz/src/main/java/com/yxt/wms/biz/sysuser/SysUserService.java
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuser/SysUserService.java
@@ -1,17 +1,14 @@
-package com.yxt.wms.biz.sysuser;
+package com.yxt.wms.biz.func.sysuser;
 
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.wms.feign.user.sysuser.SysUserDto;
-import com.yxt.wms.feign.user.sysuser.SysUserFeign;
-import com.yxt.wms.feign.user.sysuser.SysUserQuery;
-import com.yxt.wms.feign.user.sysuser.SysUserVo;
-import io.swagger.annotations.ApiOperation;
+import com.yxt.wms.feign.portal.sysuser.SysUserDto;
+import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
+import com.yxt.wms.feign.portal.sysuser.SysUserQuery;
+import com.yxt.wms.feign.portal.sysuser.SysUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -46,4 +43,10 @@ public class SysUserService {
     public ResultBean sendMessageLogin(String mobile){
         return sysUserFeign.sendMessageLogin(mobile);
     }
+    public ResultBean sendMessageUpdate(String mobile){
+        return sysUserFeign.sendMessageUpdate(mobile);
+    }
+    public ResultBean listPage(PagerQuery<SysUserQuery> pq){
+        return sysUserFeign.listPage(pq);
+    }
 }
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRole.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRole.java
new file mode 100644
index 0000000..91c3861
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRole.java
@@ -0,0 +1,34 @@
+package com.yxt.wms.biz.func.sysuserrole;
+
+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: anrui_portal(门户建设) <br/>
+ * File: SysUserRole.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRole <br/>
+ * Description: 用户与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户与角色关联表", description = "用户与角色关联表")
+@TableName("sys_user_role")
+@Data
+public class SysUserRole extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("用户sid")
+    private String userSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleDto.java
new file mode 100644
index 0000000..e00f12f
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleDto.java
@@ -0,0 +1,32 @@
+package com.yxt.wms.biz.func.sysuserrole;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserRoleDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleDto <br/>
+ * Description: 用户与角色关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户与角色关联表 数据传输对象", description = "用户与角色关联表 数据传输对象")
+@Data
+public class SysUserRoleDto implements Dto {
+
+    
+	@ApiModelProperty("用户sid")
+    private String userSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleMapper.java
new file mode 100644
index 0000000..75921ee
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleMapper.java
@@ -0,0 +1,58 @@
+package com.yxt.wms.biz.func.sysuserrole;
+
+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.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserRoleMapper.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleMapper <br/>
+ * Description: 用户与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
+
+    //@Update("update sys_user_role set name=#{msg} where id=#{id}")
+    //IPage<SysUserRoleVo> voPage(IPage<SysUserRole> page, @Param(Constants.WRAPPER) QueryWrapper<SysUserRole> qw);
+
+    IPage<SysUserRoleVo> selectPageVo(IPage<SysUserRole> page, @Param(Constants.WRAPPER) Wrapper<SysUserRole> qw);
+
+    List<SysUserRoleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysUserRole> qw);
+
+    @Select("select * from sys_user_role")
+    List<SysUserRoleVo> selectListVo();
+
+    void deleteByUserSid(String userSid);
+
+    @Delete("delete from sys_user_role where userSid=#{userSid} and roleSid=#{roleSid} ")
+    void delByUserSidAndRoleSid(@Param("userSid") String userSid,@Param("roleSid") String roleSid);
+
+    List<SysUserRoleVo> selectByUserSid(@Param("userSid")String userSid);
+
+    @Select("SELECT roleSid FROM sys_user_role WHERE userSid=#{userSid}")
+    List<String> getUserRoleSidByUserSid(@Param("userSid")String userSid);
+
+    List<String> getUserIdListByRoleSid(@Param("roleList") List<String> roleList);
+    List<String> getUserSidListByRoleSid(@Param("roleList") List<String> roleList);
+
+    int deleteByRoleSid(String sids);
+
+    List<String> selectRoleSid(String userSid);
+
+    List<String> selectByUserSids(String userSid);
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleMapper.xml
new file mode 100644
index 0000000..463534b
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleMapper.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.sysuserrole.SysUserRoleMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.wms.biz.func.sysuserrole.SysUserRoleVo">
+		SELECT * FROM sys_user_role <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.sysuserrole.SysUserRoleVo">
+		SELECT * FROM sys_user_role <where> ${ew.sqlSegment} </where>
+	</select>
+	<select id="selectByUserSid" resultType="com.yxt.wms.biz.func.sysuserrole.SysUserRoleVo">
+		 SELECT *
+        FROM sys_user_role
+        WHERE userSid = #{userSid}
+	</select>
+	<delete id="deleteByUserSid">
+		delete from sys_user_role where userSid=#{params}
+	</delete>
+	<select id="getUserIdListByRoleSid" resultType="String">
+		SELECT su.id
+		FROM sys_user_role sur
+		INNER JOIN sys_user su ON sur.userSid=su.sid
+		WHERE sur.roleSid IN
+		<foreach collection="roleList" item="item" separator="," open="(" close=")" index="">
+			#{item, jdbcType=VARCHAR}
+		</foreach>
+		GROUP BY sur.userSid
+	</select>
+	<select id="getUserSidListByRoleSid" resultType="String">
+		SELECT su.sid
+		FROM sys_user_role sur
+		INNER JOIN sys_user su ON sur.userSid=su.sid
+		WHERE sur.roleSid IN
+		<foreach collection="roleList" item="item" separator="," open="(" close=")" index="">
+			#{item, jdbcType=VARCHAR}
+		</foreach>
+		GROUP BY sur.userSid
+	</select>
+
+	<delete id="deleteByRoleSid">
+		delete from sys_user_role where roleSid = #{sids}
+    </delete>
+
+	<select id="selectRoleSid" resultType="java.lang.String">
+		select distinct roleSid from sys_user_role where userSid = #{userSid}
+    </select>
+
+	<select id="selectByUserSids" resultType="java.lang.String">
+		select roleSid from sys_user_role where userSid = #{userSid}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleQuery.java
new file mode 100644
index 0000000..f8e138a
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleQuery.java
@@ -0,0 +1,32 @@
+package com.yxt.wms.biz.func.sysuserrole;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserRoleQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleQuery <br/>
+ * Description: 用户与角色关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户与角色关联表 查询条件", description = "用户与角色关联表 查询条件")
+@Data
+public class SysUserRoleQuery implements Query {
+
+    
+	@ApiModelProperty("用户sid")
+    private String userSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleService.java
new file mode 100644
index 0000000..cdf7dba
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleService.java
@@ -0,0 +1,135 @@
+package com.yxt.wms.biz.func.sysuserrole;
+
+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.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.feign.portal.sysuserrole.SysUserRoleFeign;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserRoleService.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService <br/>
+ * Description: 用户与角色关联表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SysUserRoleService extends MybatisBaseService<SysUserRoleMapper, SysUserRole> {
+
+	@Autowired
+	SysUserRoleFeign sysUserRoleFeign;
+
+
+	public PagerVo<SysUserRole> listPage(PagerQuery<SysUserRoleQuery> pq) {
+		SysUserRoleQuery query = pq.getParams();
+		QueryWrapper<SysUserRole> qw = createQueryWrapper(query);
+		IPage<SysUserRole> page = PagerUtil.queryToPage(pq);
+		IPage<SysUserRole> pagging = baseMapper.selectPage(page, qw);
+		PagerVo<SysUserRole> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	public List<SysUserRole> listAll(SysUserRoleQuery query) {
+		QueryWrapper<SysUserRole> qw = createQueryWrapper(query);
+		return baseMapper.selectList(qw);
+	}
+	private QueryWrapper<SysUserRole> createQueryWrapper(SysUserRoleQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<SysUserRole> qw = new QueryWrapper<>();
+
+
+		if (StringUtils.isNotBlank(query.getUserSid())) {
+			qw.eq("userSid", query.getUserSid());
+		}
+
+		if (StringUtils.isNotBlank(query.getRoleSid())) {
+			qw.eq("roleSid", query.getRoleSid());
+		}
+		return qw;
+	}
+	
+	public ResultBean<PagerVo<SysUserRoleVo>> listPageVo(PagerQuery<SysUserRoleQuery> pq) {
+		return sysUserRoleFeign.listPage(pq);
+	}
+	
+	public ResultBean<List<SysUserRoleVo>> listAllVo(SysUserRoleQuery query) {
+		QueryWrapper<SysUserRole> qw = createQueryWrapper(query);
+		return sysUserRoleFeign.listAll(query);
+	}
+	
+	public ResultBean<List<SysUserRoleVo>> listVo() {
+		return sysUserRoleFeign.list();
+	}
+	
+	public ResultBean saveOrUpdateDto(SysUserRoleDto dto){
+		return sysUserRoleFeign.save(dto);
+	}
+	
+	public ResultBean<SysUserRoleVo> fetchByIdVo(String id){
+
+		return sysUserRoleFeign.fetch(id);
+	}
+
+	public void deleteByUserSid(String userSid) {
+		baseMapper.deleteByUserSid(userSid);
+	}
+	public ResultBean saveOrUpdate(SysUserRoleDto dto) {
+		return sysUserRoleFeign.update(dto);
+	}
+
+	public ResultBean del(String userSid) {
+		return sysUserRoleFeign.del(userSid);
+	}
+
+	public ResultBean delByUserSidAndRoleSid(String userSid, String roleSid) {
+		return sysUserRoleFeign.delByUserSidAndRoleSid(userSid,roleSid);
+	}
+
+    public List<SysUserRoleVo> selectByUserSid(String userSid) {
+		return baseMapper.selectByUserSid(userSid);
+    }
+	/*public void updateUserRole(SysUserRoleDto dto) {
+		//sysUserRoleService.deleteByUserSid(dto.getUserSid());
+		SysUserRole entity = new SysUserRole();
+		dto.fillEntity(entity);
+		this.saveOrUpdate (entity);
+	}*/
+
+	public ResultBean<List<String>> getUserRoleSidByUserSid(String userSid) {
+		return sysUserRoleFeign.getUserRoleSidByUserSid(userSid);
+	}
+
+	public ResultBean<List<String>> getUserIdListByRoleSid(List<String> roleList) {
+		return sysUserRoleFeign.getUserIdListByRoleSid(roleList);
+	}
+	public ResultBean<List<String>> getUserSidListByRoleSid(List<String> roleList) {
+		return new ResultBean<List<String>>().success().setData(baseMapper.getUserSidListByRoleSid(roleList));
+	}
+
+	public int deleteByRoleSid(String sids) {
+		return baseMapper.deleteByRoleSid(sids);
+	}
+
+	public List<String> selectRoleSid(String userSid) {
+		return baseMapper.selectRoleSid(userSid);
+	}
+
+	public ResultBean<List<String>> selectByUserSids(String userSid) {
+
+		return sysUserRoleFeign.selectByUserSid(userSid);
+	}
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleVo.java
new file mode 100644
index 0000000..7b77deb
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleVo.java
@@ -0,0 +1,32 @@
+package com.yxt.wms.biz.func.sysuserrole;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserRoleVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo <br/>
+ * Description: 用户与角色关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户与角色关联表 视图数据对象", description = "用户与角色关联表 视图数据对象")
+@Data
+public class SysUserRoleVo implements Vo {
+
+    
+	@ApiModelProperty("用户sid")
+    private String userSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basebrandinfo/BaseBrandInfoFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basebrandinfo/BaseBrandInfoFeign.java
index 41bc066..86a8ed0 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basebrandinfo/BaseBrandInfoFeign.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basebrandinfo/BaseBrandInfoFeign.java
@@ -3,10 +3,10 @@ package com.yxt.wms.feign.base.basebrandinfo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfo;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoDto;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoQuery;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoVo;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfo;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoDto;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoQuery;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basebrandinfo/BaseBrandInfoFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basebrandinfo/BaseBrandInfoFeignFallback.java
index 503f6d7..8ad7cbe 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basebrandinfo/BaseBrandInfoFeignFallback.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basebrandinfo/BaseBrandInfoFeignFallback.java
@@ -3,10 +3,10 @@ package com.yxt.wms.feign.base.basebrandinfo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfo;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoDto;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoQuery;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoVo;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfo;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoDto;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoQuery;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoVo;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeign.java
index d60a01c..c78d3b2 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeign.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeign.java
@@ -3,9 +3,9 @@ package com.yxt.wms.feign.base.basegoodsspu;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuDto;
-import com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuQuery;
-import com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuVo;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuDto;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuQuery;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeignFallback.java
index 65d0074..9193487 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeignFallback.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsspu/BaseGoodsSpuFeignFallback.java
@@ -3,9 +3,9 @@ package com.yxt.wms.feign.base.basegoodsspu;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuDto;
-import com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuQuery;
-import com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuVo;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuDto;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuQuery;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodstype/BaseGoodsTypeFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodstype/BaseGoodsTypeFeign.java
index 580b994..ffb0844 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodstype/BaseGoodsTypeFeign.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodstype/BaseGoodsTypeFeign.java
@@ -3,10 +3,10 @@ package com.yxt.wms.feign.base.basegoodstype;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basegoodstype.BaseGoodsType;
-import com.yxt.wms.biz.basegoodstype.BaseGoodsTypeDto;
-import com.yxt.wms.biz.basegoodstype.BaseGoodsTypeQuery;
-import com.yxt.wms.biz.basegoodstype.BaseGoodsTypeVo;
+import com.yxt.wms.biz.func.basegoodstype.BaseGoodsType;
+import com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeDto;
+import com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeQuery;
+import com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodstype/BaseGoodsTypeFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodstype/BaseGoodsTypeFeignFallback.java
index 28fcb44..564029b 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodstype/BaseGoodsTypeFeignFallback.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodstype/BaseGoodsTypeFeignFallback.java
@@ -3,10 +3,10 @@ package com.yxt.wms.feign.base.basegoodstype;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basegoodstype.BaseGoodsType;
-import com.yxt.wms.biz.basegoodstype.BaseGoodsTypeDto;
-import com.yxt.wms.biz.basegoodstype.BaseGoodsTypeQuery;
-import com.yxt.wms.biz.basegoodstype.BaseGoodsTypeVo;
+import com.yxt.wms.biz.func.basegoodstype.BaseGoodsType;
+import com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeDto;
+import com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeQuery;
+import com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeVo;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsunit/BaseGoodsUnitFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsunit/BaseGoodsUnitFeign.java
index 43bbb0b..3bfdc70 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsunit/BaseGoodsUnitFeign.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsunit/BaseGoodsUnitFeign.java
@@ -3,10 +3,10 @@ package com.yxt.wms.feign.base.basegoodsunit;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basegoodsunit.BaseGoodsUnit;
-import com.yxt.wms.biz.basegoodsunit.BaseGoodsUnitDto;
-import com.yxt.wms.biz.basegoodsunit.BaseGoodsUnitQuery;
-import com.yxt.wms.biz.basegoodsunit.BaseGoodsUnitVo;
+import com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnit;
+import com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnitDto;
+import com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnitQuery;
+import com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnitVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsunit/BaseGoodsUnitFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsunit/BaseGoodsUnitFeignFallback.java
index 3dd7f3c..8876729 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsunit/BaseGoodsUnitFeignFallback.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodsunit/BaseGoodsUnitFeignFallback.java
@@ -3,10 +3,10 @@ package com.yxt.wms.feign.base.basegoodsunit;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basegoodsunit.BaseGoodsUnit;
-import com.yxt.wms.biz.basegoodsunit.BaseGoodsUnitDto;
-import com.yxt.wms.biz.basegoodsunit.BaseGoodsUnitQuery;
-import com.yxt.wms.biz.basegoodsunit.BaseGoodsUnitVo;
+import com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnit;
+import com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnitDto;
+import com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnitQuery;
+import com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnitVo;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basemanufacturer/BaseManufacturerFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basemanufacturer/BaseManufacturerFeign.java
index 4bc578c..55baa99 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basemanufacturer/BaseManufacturerFeign.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basemanufacturer/BaseManufacturerFeign.java
@@ -3,10 +3,10 @@ package com.yxt.wms.feign.base.basemanufacturer;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basemanufacturer.BaseManufacturer;
-import com.yxt.wms.biz.basemanufacturer.BaseManufacturerDto;
-import com.yxt.wms.biz.basemanufacturer.BaseManufacturerQuery;
-import com.yxt.wms.biz.basemanufacturer.BaseManufacturerVo;
+import com.yxt.wms.biz.func.basemanufacturer.BaseManufacturer;
+import com.yxt.wms.biz.func.basemanufacturer.BaseManufacturerDto;
+import com.yxt.wms.biz.func.basemanufacturer.BaseManufacturerQuery;
+import com.yxt.wms.biz.func.basemanufacturer.BaseManufacturerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basemanufacturer/BaseManufacturerFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basemanufacturer/BaseManufacturerFeignFallback.java
index a2a0e89..be7d388 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basemanufacturer/BaseManufacturerFeignFallback.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basemanufacturer/BaseManufacturerFeignFallback.java
@@ -3,10 +3,10 @@ package com.yxt.wms.feign.base.basemanufacturer;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basemanufacturer.BaseManufacturer;
-import com.yxt.wms.biz.basemanufacturer.BaseManufacturerDto;
-import com.yxt.wms.biz.basemanufacturer.BaseManufacturerQuery;
-import com.yxt.wms.biz.basemanufacturer.BaseManufacturerVo;
+import com.yxt.wms.biz.func.basemanufacturer.BaseManufacturer;
+import com.yxt.wms.biz.func.basemanufacturer.BaseManufacturerDto;
+import com.yxt.wms.biz.func.basemanufacturer.BaseManufacturerQuery;
+import com.yxt.wms.biz.func.basemanufacturer.BaseManufacturerVo;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java
index 131be3d..8446df6 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java
@@ -3,7 +3,7 @@ package com.yxt.wms.feign.base.basesupplierinfo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basesupplierinfo.*;
+import com.yxt.wms.biz.func.basesupplierinfo.*;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java
index 5f559c1..eac4a0e 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java
@@ -3,7 +3,7 @@ package com.yxt.wms.feign.base.basesupplierinfo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basesupplierinfo.*;
+import com.yxt.wms.biz.func.basesupplierinfo.*;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/dictcommon/DictCommonFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/dictcommon/DictCommonFeign.java
new file mode 100644
index 0000000..005f3dc
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/dictcommon/DictCommonFeign.java
@@ -0,0 +1,68 @@
+package com.yxt.wms.feign.portal.dictcommon;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.dictcommon.DictCommonDto;
+import com.yxt.wms.biz.func.dictcommon.DictCommonQuery;
+import com.yxt.wms.biz.func.dictcommon.DictCommonVo;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/5 21:59
+ * @description
+ */
+@FeignClient(
+        contextId = "ss-common-portal-DictCommon",
+        name = "ss-common-portal",
+        path = "apiadmin/dictcommons",
+        fallback = DictCommonFeignFallback.class)
+public interface DictCommonFeign {
+
+    @PostMapping(value = "/save")
+    @ResponseBody
+    @ApiOperation(value = "数据字典数据项保存")
+    ResultBean save(@Valid @RequestBody DictCommonDto dictCommonDto);
+
+    @PostMapping("/pageList")
+    @ResponseBody
+    @ApiOperation(value = "数据字典数据项分页列表")
+    ResultBean<PagerVo<DictCommonVo>> pageList(@RequestBody PagerQuery<DictCommonQuery> pagerQuery);
+
+    @PostMapping("/update/{sid}")
+    @ResponseBody
+    @ApiOperation(value = "数据字典修改后保存")
+    ResultBean update(@Valid @RequestBody DictCommonDto dictCommonDto, @ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid);
+
+    @ResponseBody
+    @DeleteMapping("/delete/{sid}")
+    @ApiOperation(value = "删除")
+    ResultBean delete(@ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid);
+
+    @ResponseBody
+    @GetMapping("/selectBykey/{key}/{type}")
+    @ApiOperation(value = "数据字典信息修改时的初始化信息")
+    public ResultBean<DictCommonVo> selectBykey(@ApiParam(value = "数据字典key", required = true) @PathVariable("key") String key, @ApiParam(value = "数据字典type", required = true) @PathVariable("type") String type);
+
+    @GetMapping("/typeValues")
+    @ResponseBody
+    @ApiOperation("下拉框的获取")
+    ResultBean<List<DictCommonVo>> getTypeValues(@RequestParam("type") String type,  @RequestParam(value = "psid", defaultValue = "0")String psid);
+
+    @GetMapping("/getFirstDictKeyByType")
+    @ResponseBody
+    @ApiOperation("根据数据字典的key获取第一个值（默认值）")
+    ResultBean getFirstDictKeyByType(@RequestParam("dictType") String dictType, @RequestParam("psid") String psid);
+
+    @GetMapping("/getTypeValueList")
+    @ResponseBody
+    @ApiOperation("根据分类编码和数据分组查询数据字典")
+    ResultBean<List<DictCommonVo>> getTypeValueList(@RequestParam("type")String type,@RequestParam("groupNum")String groupNum);
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/dictcommon/DictCommonFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/dictcommon/DictCommonFeignFallback.java
new file mode 100644
index 0000000..b9d0387
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/dictcommon/DictCommonFeignFallback.java
@@ -0,0 +1,60 @@
+package com.yxt.wms.feign.portal.dictcommon;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.dictcommon.DictCommonDto;
+import com.yxt.wms.biz.func.dictcommon.DictCommonQuery;
+import com.yxt.wms.biz.func.dictcommon.DictCommonVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/5 22:00
+ * @description
+ */
+@Component
+public class DictCommonFeignFallback implements DictCommonFeign {
+
+    @Override
+    public ResultBean save(DictCommonDto dictCommonDto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<DictCommonVo>> pageList(PagerQuery<DictCommonQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean update(DictCommonDto dictCommonDto, String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean delete(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<DictCommonVo> selectBykey(String key, String type) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<DictCommonVo>> getTypeValues(String type, String psid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean getFirstDictKeyByType(String dictType, String psid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<DictCommonVo>> getTypeValueList(String type, String groupNum) {
+        return null;
+    }
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/dicttype/DictTypeFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/dicttype/DictTypeFeign.java
new file mode 100644
index 0000000..423d8ce
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/dicttype/DictTypeFeign.java
@@ -0,0 +1,49 @@
+package com.yxt.wms.feign.portal.dicttype;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.dicttype.DictTypeDto;
+import com.yxt.wms.biz.func.dicttype.DictTypeQuery;
+import com.yxt.wms.biz.func.dicttype.DictTypeVo;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:21
+ * @description 数据字典类型对外接口
+ */
+@FeignClient(
+        contextId = "ss-common-portal-DictType",
+        name = "ss-common-portal",
+        path = "apiadmin/dicttypes",
+        fallback = DictTypeFeignFallback.class)
+public interface DictTypeFeign {
+
+    @PostMapping(value = "/save")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型保存")
+    ResultBean save(@Valid @RequestBody DictTypeDto dictTypeDto);
+
+    @PostMapping("/pageList")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型分页列表")
+    ResultBean<PagerVo<DictTypeVo>> pageList(@RequestBody PagerQuery<DictTypeQuery> pagerQuery);
+
+    @PostMapping("/update/{sid}")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型更新")
+    ResultBean update(@Valid DictTypeDto dictTypeDto, @ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid);
+
+    @DeleteMapping("/delete/{sid}")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型删除")
+    ResultBean delete(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
+
+
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/dicttype/DictTypeFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/dicttype/DictTypeFeignFallback.java
new file mode 100644
index 0000000..21a21e0
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/dicttype/DictTypeFeignFallback.java
@@ -0,0 +1,37 @@
+package com.yxt.wms.feign.portal.dicttype;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.dicttype.DictTypeDto;
+import com.yxt.wms.biz.func.dicttype.DictTypeQuery;
+import com.yxt.wms.biz.func.dicttype.DictTypeVo;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/5 22:32
+ * @description
+ */
+
+public class DictTypeFeignFallback implements DictTypeFeign{
+
+    @Override
+    public ResultBean save(DictTypeDto dictTypeDto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<DictTypeVo>> pageList(PagerQuery<DictTypeQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean update(DictTypeDto dictTypeDto, String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean delete(String sid) {
+        return null;
+    }
+}
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysmenu/SysMenuFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysmenu/SysMenuFeign.java
new file mode 100644
index 0000000..1235297
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysmenu/SysMenuFeign.java
@@ -0,0 +1,124 @@
+package com.yxt.wms.feign.portal.sysmenu;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysmenu.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuFeign <br/>
+ * Description: 菜单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "菜单表")
+@FeignClient(
+        contextId = "ss-common-portal-SysMenu",
+        name = "ss-common-portal",
+        path = "/apiadmin/sysmenu",
+        fallback = SysMenuFeignFallback.class)
+public interface SysMenuFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysMenuVo>> listPage(@RequestBody PagerQuery<SysMenuQuery> pq);
+
+/*    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<SysMenuVo>> listAll(@RequestBody SysMenuQuery query);*/
+
+    /**
+     * 菜单列表：根据资源归类
+     *
+     * @param query
+     * @return
+     */
+    @ApiOperation("菜单列表：根据资源归类")
+    @PostMapping("/listAllVoForSource")
+    public ResultBean<List<SysMenuTreeVo>> listAllVoForSource(@RequestBody SysMenuQuery query);
+    /**
+     * 菜单列表：根据资源归类 设置功能的url用
+     * @return
+     */
+    @ApiOperation("菜单列表：根据资源归类 设置功能的url用")
+    @PostMapping("/getMenusForFunction")
+    public ResultBean<List<Map<String,String>>> getMenusForFunction(@RequestBody SysMenuFunctionQuery sysMenuFunctionQuery);
+    @ApiOperation("根据用户sid查询所有数据列表 ")
+    @PostMapping("/sourceMenuTreeByUserSid")
+    public ResultBean<List<Map<String, Object>>> sourceMenuTreeByUserSid(@RequestBody SysMenuQuery query);
+    @ApiOperation("根据资源sid查询所有数据列表 ")
+    @PostMapping("/sourcemenutree")
+    public ResultBean<List<Map<String, Object>>> sourcemenutree(@RequestBody SysMenuQuery query);
+
+    @ApiOperation("根据角色sid条件查询所有数据列表")
+    @PostMapping("/listAllByRoleSid")
+    public ResultBean<List<SysMenuVo>> listAllByRoleSid(@RequestBody SysMenuQuery query);
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<SysMenuVo>> list();
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@Valid @RequestBody SysMenuDto dto);
+
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@Valid @RequestBody SysMenuDto dto, @PathVariable("sid") String sid);
+
+    /*  @ApiOperation("修改保存")
+      @PostMapping("/updateSort/{sid}")
+      public ResultBean updateSort(@RequestBody SysMenuDto dto,@PathVariable("sid") String sid);
+  */
+
+    /**
+     * 修改是否可用的状态
+     *
+     * @param sid      菜单sid或资源sid
+     * @param isEnable 是否可用的状态：1可用，0不可用
+     * @return
+     */
+    @ApiOperation("修改是否可用的状态 ")
+    @PostMapping("/updateIsEnable/{sid}/{isEnable}")
+    public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") Integer isEnable);
+
+   /* @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids);*/
+
+    /**
+     * 根据当前行sid删除菜单
+     *
+     * @param sid 菜单sid
+     * @return
+     */
+    @ApiOperation("删除记录 根据sid")
+    @GetMapping("/delBySids/{sid}")
+    public ResultBean delBySids(@PathVariable("sid") String sid);
+
+   /* @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<SysMenuVo> fetch(@PathVariable("id") String id);
+
+    @ApiOperation("获取一条记录 根据sid")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<SysMenuVo> fetchBySid(@PathVariable("sid") String sid);*/
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysmenu/SysMenuFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysmenu/SysMenuFeignFallback.java
new file mode 100644
index 0000000..71f99b8
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysmenu/SysMenuFeignFallback.java
@@ -0,0 +1,83 @@
+package com.yxt.wms.feign.portal.sysmenu;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysmenu.*;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuFeignFallback <br/>
+ * Description: 菜单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class SysMenuFeignFallback implements SysMenuFeign {
+
+
+	@Override
+	public ResultBean<PagerVo<SysMenuVo>> listPage(PagerQuery<SysMenuQuery> pq) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<SysMenuTreeVo>> listAllVoForSource(SysMenuQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<Map<String, String>>> getMenusForFunction(SysMenuFunctionQuery sysMenuFunctionQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<Map<String, Object>>> sourceMenuTreeByUserSid(SysMenuQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<Map<String, Object>>> sourcemenutree(SysMenuQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<SysMenuVo>> listAllByRoleSid(SysMenuQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<SysMenuVo>> list() {
+		return null;
+	}
+
+	@Override
+	public ResultBean save(SysMenuDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean update(SysMenuDto dto, String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean updateIsEnable(String sid, Integer isEnable) {
+		return null;
+	}
+
+	@Override
+	public ResultBean delBySids(String sid) {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysmenurole/SysMenuRoleFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysmenurole/SysMenuRoleFeign.java
new file mode 100644
index 0000000..755e2c9
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysmenurole/SysMenuRoleFeign.java
@@ -0,0 +1,84 @@
+package com.yxt.wms.feign.portal.sysmenurole;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysmenurole.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleFeign <br/>
+ * Description: 菜单与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "菜单与角色关联表")
+@FeignClient(
+        contextId = "ss-common-portal-SysMenuRole",
+        name = "ss-common-portal",
+        path = "/apiadmin/sysmenurole",
+        fallback = SysMenuRoleFeignFallback.class)
+public interface SysMenuRoleFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysMenuRoleVo>> listPage(@RequestBody PagerQuery<SysMenuRoleQuery> pq);
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<SysMenuRoleVo>> listAll(@RequestBody SysMenuRoleQuery query);
+
+    @ApiOperation("根据角色查询授权的菜单列表(PC)")
+    @PostMapping("/selMenuByRole")
+    public ResultBean<List<SysMenuRoleDataVo>> selMenuByRole(@RequestBody SysMenuRoleDataQuery query);
+
+    @ApiOperation("根据角色查询授权的菜单列表(APP)")
+    @PostMapping("/selMenuByRoleApp")
+    public ResultBean<List<SysMenuRoleDataVo>> selMenuByRoleApp(@RequestBody SysMenuRoleDataQuery query);
+
+    @ApiOperation("修改角色菜单的数据权限（PC）")
+    @PostMapping("/updateDataByRoleMenu")
+    public ResultBean updateDataByRoleMenu(@RequestBody List<SysMenuRoleDataDto> dtos);
+
+    @ApiOperation("修改角色菜单的数据权限（移动端）")
+    @PostMapping("/updateDataByRoleMenuApp")
+    public ResultBean updateDataByRoleMenuApp(@RequestBody List<SysMenuRoleDataDto> dtos);
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<SysMenuRoleVo>> list();
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysMenuRoleDto dto);
+      
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody SysMenuRoleDto dto,@PathVariable("sid") String sid);
+    @ApiOperation("修改角色的菜单配置")
+    @PostMapping("/updateRoleAndMenu")
+    public ResultBean updateRoleAndMenu(@RequestBody SysMenuRoleDto dto);
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids);
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<SysMenuRoleVo> fetch(@PathVariable("id") String id);
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysmenurole/SysMenuRoleFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysmenurole/SysMenuRoleFeignFallback.java
new file mode 100644
index 0000000..ed66271
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysmenurole/SysMenuRoleFeignFallback.java
@@ -0,0 +1,86 @@
+package com.yxt.wms.feign.portal.sysmenurole;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysmenurole.*;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleFeignFallback <br/>
+ * Description: 菜单与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class SysMenuRoleFeignFallback implements SysMenuRoleFeign {
+
+	@Override
+	public ResultBean<PagerVo<SysMenuRoleVo>> listPage(PagerQuery<SysMenuRoleQuery> pq) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<SysMenuRoleVo>> listAll(SysMenuRoleQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<SysMenuRoleDataVo>> selMenuByRole(SysMenuRoleDataQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<SysMenuRoleDataVo>> selMenuByRoleApp(SysMenuRoleDataQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean updateDataByRoleMenu(List<SysMenuRoleDataDto> dtos) {
+		return null;
+	}
+
+	@Override
+	public ResultBean updateDataByRoleMenuApp(List<SysMenuRoleDataDto> dtos) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<SysMenuRoleVo>> list() {
+		return null;
+	}
+
+	@Override
+	public ResultBean save(SysMenuRoleDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean update(SysMenuRoleDto dto, String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean updateRoleAndMenu(SysMenuRoleDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean del(String ids) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<SysMenuRoleVo> fetch(String id) {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeign.java
new file mode 100644
index 0000000..7b2dac4
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeign.java
@@ -0,0 +1,204 @@
+package com.yxt.wms.feign.portal.sysorganization;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysorganization.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign <br/>
+ * Description: 组织机构表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "组织机构表")
+@FeignClient(
+        contextId = "ss-common-portal-SysOrganization",
+        name = "ss-common-portal",
+        path = "apiadmin/sysorganization",
+        fallback = SysOrganizationFeignFallback.class)
+public interface SysOrganizationFeign {
+    @PostMapping("/saveSysOrg")
+    public ResultBean saveOrg(@RequestBody SysOrganizationDto dto);
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysOrganizationVo>> listPage(@RequestBody PagerQuery<SysOrganizationQuery> pq);
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<SysOrganizationVo>> listAll(@RequestBody SysOrganizationQuery query);
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<SysOrganizationVo>> list();
+
+    @ApiOperation("一级组织机构列表")
+    @GetMapping("/selectFirstOrgList")
+    public ResultBean<List<SysOrganizationVo>> selectFirstOrgList();
+
+    @ApiOperation("根据父级sid查询子集列表")
+    @GetMapping("/selectChildrenListBySid/{sid}")
+    public ResultBean<List<SysOrganizationVo>> selectChildrenListBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysOrganizationDto dto);
+
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody SysOrganizationDto dto, @PathVariable("sid") String sid);
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids);
+
+    @ApiOperation("删除记录 根据sid")
+    @GetMapping("/delBySid/{sid}")
+    public ResultBean delBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<SysOrganizationVo> fetch(@PathVariable("id") String id);
+
+    @ApiOperation("获取一条记录 根据sid")
+    @ResponseBody
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<SysOrganizationVo> fetchBySid(@PathVariable("sid") String sid);
+
+
+    @ApiOperation("手机获取组织架构")
+    @ResponseBody
+    @GetMapping("/selectAppOrganization")
+    public ResultBean<Map<String, Object>> selectAppOrganization(@RequestParam(value = "sid", required = false) String sid);
+
+    @ApiOperation("组织架构")
+    @ResponseBody
+    @GetMapping("/selectListOrg")
+    ResultBean<List<SysOrgVo>> selectListOrg();
+
+    @ApiOperation("获取到分公司")
+    @ResponseBody
+    @GetMapping("/getListOrg")
+    ResultBean<List<SysOrgVo>> getListOrg();
+
+    @ApiOperation("获取同品牌下分公司")
+    @ResponseBody
+    @GetMapping("/getListOrgByBrand/{orgSid}")
+    ResultBean<List<SysOrgVo>> getListOrgByBrand(@PathVariable(value = "orgSid") String orgSid);
+
+    @ApiOperation("获取指定品牌下分公司(已筛选本分公司)")
+    @ResponseBody
+    @GetMapping("/getListOrgByBrandSid/{orgSid}/{brandSid}")
+    ResultBean<List<SysOrgVo>> getListOrgByBrandSid(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid);
+
+    @ApiOperation("获取指定品牌下分公司(未筛选本分公司)")
+    @ResponseBody
+    @GetMapping("/getListOrgByBrandSidNo/{orgSid}/{brandSid}")
+    ResultBean<List<SysOrgVo>> getListOrgByBrandSidNo(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid);
+
+    @ApiOperation("获取指定分公司下部门信息")
+    @ResponseBody
+    @GetMapping("/getListDeptByOrgSid/{orgSid}")
+    ResultBean<List<SysOrgVo>> getListDeptByOrgSid(@PathVariable(value = "orgSid") String orgSid);
+
+    @ApiOperation("根据业务员sid获取到分公司")
+    @ResponseBody
+    @GetMapping("/getUseOrgByUserSid")
+    ResultBean<SysOrganizationVo> getUseOrgByUserSid(@RequestParam("userSid") String userSid);
+
+    @ApiOperation("根据部门sid查询组织信息")
+    @ResponseBody
+    @GetMapping("/selectBySid")
+    ResultBean<SysOrganization> selectBySid(@RequestParam("sid") String sid);
+
+    @ApiOperation("根据组织架构sid查询组织下所有分公司")
+    @ResponseBody
+    @GetMapping("/selectUseOrgSidBySid")
+    ResultBean<List<Map<String, String>>> selectUseOrgSidBySid(@RequestParam("sid") String sid);
+
+    /**
+     * 查询公司所有的部门
+     *
+     * @return
+     */
+    @ApiOperation("所在部门下拉")
+    @ResponseBody
+    @GetMapping("/selectListOne")
+    ResultBean<List<SysOrgListVo>> selectListOne();
+
+    @PostMapping("/getQrCode/{sid}")
+    @ResponseBody
+    @ApiOperation("查看二维码")
+    public ResultBean<QrCodeVo> getQrCode(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
+
+    @GetMapping("/getOrgSid/{sid}")
+    @ResponseBody
+    @ApiOperation("根据当前用户的所在组织获取当前用户所在的分公司")
+    ResultBean<String> getOrgSid(@PathVariable(value = "sid") String sid);
+
+    @GetMapping("/selectOrgList")
+    @ResponseBody
+    @ApiOperation("当前分公司销售部门及部门人员")
+    ResultBean<List<SysOrganizationListVo>> selectOrgList(@SpringQueryMap SysOrganizationListQuery query);
+
+    @GetMapping("/selectOrgList2")
+    @ResponseBody
+    @ApiOperation("当前分公司销售部门及部门人员")
+    ResultBean<List<SysOrganizationListVo>> selectOrgList2(@SpringQueryMap SysOrganizationListQuery query);
+
+    @GetMapping("/selectOrgLists")
+    @ResponseBody
+    @ApiOperation("当前分公司下所有部门")
+    ResultBean<List<SysOrganizationListsVo>> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query);
+
+    @GetMapping("/selectByPSid")
+    @ResponseBody
+    @ApiOperation("查询分公司下的销售支持部")
+    ResultBean<SysOrganizationVo> selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name);
+
+    @GetMapping("/selectOrgSidList")
+    @ResponseBody
+    @ApiOperation("所有分公司sid")
+    ResultBean<List<SysOrganizationVo>> selectOrgSidList();
+
+    @GetMapping("/selectOrgByPSid")
+    @ResponseBody
+    @ApiOperation("查询事业部下所有分公司")
+    ResultBean<List<SysOrganizationVo>> selectOrgByPSid(@RequestParam("psid") String psid);
+
+    @GetMapping("/selectByOrgSidPath")
+    @ResponseBody
+    @ApiOperation("组织层级分页查询")
+    ResultBean<SysOrganizationVo> selectByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath);
+
+    @GetMapping("/selectByOrgCode")
+    @ResponseBody
+    @ApiOperation("根据code查询组织信息")
+    ResultBean<SysOrganization> selectByOrgCode(@RequestParam("orgCode") String orgCode);
+
+//    @GetMapping("/selectFinance")
+//    @ResponseBody
+//    @ApiOperation("查询金融部主管人员")
+//    ResultBean<List<SysFinanceVo>> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid);
+
+    @GetMapping("/selectByCJOrgPath")
+    @ResponseBody
+    @ApiOperation("根据管理层级截取路径")
+    ResultBean<String> selectByCJOrgPath(@RequestParam("orgPath") String orgPath);
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeignFallback.java
new file mode 100644
index 0000000..f2e7bcb
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeignFallback.java
@@ -0,0 +1,198 @@
+package com.yxt.wms.feign.portal.sysorganization;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysorganization.*;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeignFallback <br/>
+ * Description: 组织机构表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class SysOrganizationFeignFallback implements SysOrganizationFeign {
+
+
+    @Override
+    public ResultBean saveOrg(SysOrganizationDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<SysOrganizationVo>> listPage(PagerQuery<SysOrganizationQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> listAll(SysOrganizationQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> list() {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> selectFirstOrgList() {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> selectChildrenListBySid(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean save(SysOrganizationDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean update(SysOrganizationDto dto, String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean del(String ids) {
+        return null;
+    }
+
+    @Override
+    public ResultBean delBySid(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<SysOrganizationVo> fetch(String id) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<SysOrganizationVo> fetchBySid(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<Map<String, Object>> selectAppOrganization(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrgVo>> selectListOrg() {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrgVo>> getListOrg() {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrgVo>> getListOrgByBrand(String orgSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrgVo>> getListOrgByBrandSid(String orgSid, String brandSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrgVo>> getListOrgByBrandSidNo(String orgSid, String brandSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrgVo>> getListDeptByOrgSid(String orgSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<SysOrganizationVo> getUseOrgByUserSid(String userSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<SysOrganization> selectBySid(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<Map<String, String>>> selectUseOrgSidBySid(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrgListVo>> selectListOne() {
+        return null;
+    }
+
+    @Override
+    public ResultBean<QrCodeVo> getQrCode(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> getOrgSid(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList2(SysOrganizationListQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<SysOrganizationVo> selectByPSid(String sid, String name) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> selectOrgSidList() {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysOrganizationVo>> selectOrgByPSid(String psid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<SysOrganizationVo> selectByOrgSidPath(String orgSidPath) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<SysOrganization> selectByOrgCode(String orgCode) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> selectByCJOrgPath(String orgPath) {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/syspost/SysPostFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/syspost/SysPostFeign.java
new file mode 100644
index 0000000..257a0ea
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/syspost/SysPostFeign.java
@@ -0,0 +1,93 @@
+package com.yxt.wms.feign.portal.syspost;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.syspost.SysPostDto;
+import com.yxt.wms.biz.func.syspost.SysPostListVo;
+import com.yxt.wms.biz.func.syspost.SysPostQuery;
+import com.yxt.wms.biz.func.syspost.SysPostVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPostFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostFeign <br/>
+ * Description: 岗位. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "岗位")
+@FeignClient(
+        contextId = "ss-common-portal-SysPost",
+        name = "ss-common-portal",
+        path = "apiadmin/syspost",
+        fallback = SysPostFeignFallback.class)
+public interface SysPostFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysPostVo>> listPage(@RequestBody PagerQuery<SysPostQuery> pq);
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<SysPostVo>> listAll(@RequestBody SysPostQuery query);
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<SysPostVo>> list();
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysPostDto dto);
+
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody SysPostDto dto, @PathVariable("sid") String sid);
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids);
+
+    @ApiOperation("删除记录")
+    @GetMapping("/delBySids/{sids}")
+    public ResultBean delBySids(@PathVariable("sids") String sids);
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<SysPostVo> fetch(@PathVariable("id") String id);
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<SysPostVo> fetchBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据部门sid获取岗位列表")
+    @GetMapping("/fetchByOrgSid/{orgSid}")
+    public ResultBean<List<SysPostVo>> fetchByOrgSid(@PathVariable("orgSid") String orgSid);
+
+    @ApiOperation("根据部门sid获取岗位编号")
+    @GetMapping("/fetchByOrgSidPostCode/{orgSid}")
+    public ResultBean<String> fetchByOrgSidPostCode();
+
+    /**
+     * 查询岗位列表
+     *
+     * @return
+     */
+    @ApiOperation("查询岗位列表")
+    @GetMapping("/selectList")
+    public ResultBean<List<SysPostListVo>> selectList();
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/syspost/SysPostFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/syspost/SysPostFeignFallback.java
new file mode 100644
index 0000000..51c1e30
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/syspost/SysPostFeignFallback.java
@@ -0,0 +1,89 @@
+package com.yxt.wms.feign.portal.syspost;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.syspost.SysPostDto;
+import com.yxt.wms.biz.func.syspost.SysPostListVo;
+import com.yxt.wms.biz.func.syspost.SysPostQuery;
+import com.yxt.wms.biz.func.syspost.SysPostVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPostFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostFeignFallback <br/>
+ * Description: 岗位. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class SysPostFeignFallback implements SysPostFeign {
+
+    @Override
+    public ResultBean<PagerVo<SysPostVo>> listPage(PagerQuery<SysPostQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysPostVo>> listAll(SysPostQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysPostVo>> list() {
+        return null;
+    }
+
+    @Override
+    public ResultBean save(SysPostDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean update(SysPostDto dto, String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean del(String ids) {
+        return null;
+    }
+
+    @Override
+    public ResultBean delBySids(String sids) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<SysPostVo> fetch(String id) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<SysPostVo> fetchBySid(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysPostVo>> fetchByOrgSid(String orgSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> fetchByOrgSidPostCode() {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<SysPostListVo>> selectList() {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysrole/SysRoleFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysrole/SysRoleFeign.java
new file mode 100644
index 0000000..4d1aabe
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysrole/SysRoleFeign.java
@@ -0,0 +1,86 @@
+package com.yxt.wms.feign.portal.sysrole;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysrole.SysRoleDto;
+import com.yxt.wms.biz.func.sysrole.SysRoleQuery;
+import com.yxt.wms.biz.func.sysrole.SysRoleVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "角色")
+@FeignClient(
+        contextId = "ss-common-portal-SysRole",
+        name = "ss-common-portal",
+        path = "/apiadmin/sysrole",
+        fallback = SysRoleFeignFallback.class)
+public interface SysRoleFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysRoleVo>> listPage(@RequestBody PagerQuery<SysRoleQuery> pq);
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<SysRoleVo>> listAll(@RequestBody SysRoleQuery query);
+    @ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色")
+    @PostMapping("/listAllByUserSid/{userSid}")
+    public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid);
+
+    @ApiOperation("根据用户sid查询用户的角色列表")
+    @PostMapping("/fetchByUserSid/{userSid}")
+    public ResultBean<List<SysRoleVo>> fetchByUserSid(@PathVariable("userSid") String userSid);
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<SysRoleVo>> list();
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysRoleDto dto);
+      
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody SysRoleDto dto,@PathVariable("sid") String sid);
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids);
+
+    @ApiOperation("删除记录根据sids")
+    @GetMapping("/delBySids/{sids}")
+    public ResultBean delBySids(@PathVariable("sids") String sids);
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<SysRoleVo> fetch(@PathVariable("id") String id);
+
+    @ApiOperation("获取一条记录根据sid")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<SysRoleVo> fetchBySid(@PathVariable("sid") String sid);
+
+    @PostMapping("/setIsEnable/{sid}/{isEnable}")
+    @ResponseBody
+    @ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用")
+    public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable);
+
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysrole/SysRoleFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysrole/SysRoleFeignFallback.java
new file mode 100644
index 0000000..6c35619
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysrole/SysRoleFeignFallback.java
@@ -0,0 +1,88 @@
+package com.yxt.wms.feign.portal.sysrole;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysrole.SysRoleDto;
+import com.yxt.wms.biz.func.sysrole.SysRoleQuery;
+import com.yxt.wms.biz.func.sysrole.SysRoleVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class SysRoleFeignFallback implements SysRoleFeign {
+
+	@Override
+	public ResultBean<PagerVo<SysRoleVo>> listPage(PagerQuery<SysRoleQuery> pq) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<SysRoleVo>> listAll(SysRoleQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<SysRoleVo>> fetchByUserSid(String userSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<SysRoleVo>> list() {
+		return null;
+	}
+
+	@Override
+	public ResultBean save(SysRoleDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean update(SysRoleDto dto, String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean del(String ids) {
+		return null;
+	}
+
+	@Override
+	public ResultBean delBySids(String sids) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<SysRoleVo> fetch(String id) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<SysRoleVo> fetchBySid(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean setIsEnable(String sid, String isEnable) {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/OrgList.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/OrgList.java
similarity index 89%
rename from wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/OrgList.java
rename to wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/OrgList.java
index 6c067b7..df15054 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/OrgList.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/OrgList.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.feign.user.sysuser;
+package com.yxt.wms.feign.portal.sysuser;
 
 import com.yxt.common.core.vo.Vo;
 import lombok.Data;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysOrganization.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysOrganization.java
similarity index 98%
rename from wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysOrganization.java
rename to wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysOrganization.java
index c15c93f..fce7d9f 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysOrganization.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysOrganization.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.feign.user.sysuser;
+package com.yxt.wms.feign.portal.sysuser;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserDto.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserDto.java
similarity index 97%
rename from wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserDto.java
rename to wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserDto.java
index fdf5bf0..d6d3d9a 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserDto.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserDto.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.feign.user.sysuser;
+package com.yxt.wms.feign.portal.sysuser;
 
 
 import com.yxt.common.core.dto.Dto;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java
similarity index 68%
rename from wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserFeign.java
rename to wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java
index 36d80e0..1218473 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserFeign.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java
@@ -1,21 +1,14 @@
-package com.yxt.wms.feign.user.sysuser;
+package com.yxt.wms.feign.portal.sysuser;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.yxt.common.base.utils.RegexUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfo;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoDto;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoQuery;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoVo;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 
 /**
  * @description:
@@ -23,8 +16,8 @@ import java.util.List;
  * @date: 2024/4/12
  **/
 @FeignClient(
-        contextId = "ss-common-user-SysUser",
-        name = "ss-common-user",
+        contextId = "ss-common-portal-SysUser",
+        name = "ss-common-portal",
         path = "/apiadmin/sysuser",
         fallback = SysUserFeignFallback.class)
 public interface SysUserFeign {
@@ -49,12 +42,20 @@ public interface SysUserFeign {
     @ResponseBody
     @ApiOperation(value = "3、获取注册码")
     @ApiOperationSupport(order = 30)
-    public ResultBean sendMessageCode(String mobile);
+    public ResultBean sendMessageCode(@RequestParam("mobile") String mobile);
 
     @PostMapping("/sendMessageLogin")
     @ResponseBody
     @ApiOperation(value = "3、获取登录码")
     @ApiOperationSupport(order = 30)
-    public ResultBean sendMessageLogin(String mobile);
+    public ResultBean sendMessageLogin(@RequestParam("mobile") String mobile);
+    @PostMapping("/sendMessageUpdate")
+    @ResponseBody
+    @ApiOperation(value = "3、获取登录码")
+    @ApiOperationSupport(order = 30)
+    public ResultBean sendMessageUpdate(@RequestParam("mobile") String mobile);
+    @ApiOperation("根据条件分页查询数据的列表 ")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysUserVo>> listPage(@RequestBody PagerQuery<SysUserQuery> pq);
 
 }
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeignFallback.java
similarity index 76%
rename from wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserFeignFallback.java
rename to wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeignFallback.java
index 4496ef1..6d87ffd 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserFeignFallback.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeignFallback.java
@@ -1,16 +1,11 @@
-package com.yxt.wms.feign.user.sysuser;
+package com.yxt.wms.feign.portal.sysuser;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfo;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoDto;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoQuery;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoVo;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 
 /**
  * @description:
@@ -45,4 +40,14 @@ public class SysUserFeignFallback implements SysUserFeign {
     public ResultBean sendMessageLogin(String mobile) {
         return null;
     }
+
+    @Override
+    public ResultBean sendMessageUpdate(String mobile) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<SysUserVo>> listPage(PagerQuery<SysUserQuery> pq) {
+        return null;
+    }
 }
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserQuery.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserQuery.java
similarity index 97%
rename from wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserQuery.java
rename to wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserQuery.java
index 1ba7cbf..a8710ae 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserQuery.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserQuery.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.feign.user.sysuser;
+package com.yxt.wms.feign.portal.sysuser;
 
 
 import com.yxt.common.core.query.Query;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserVo.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java
similarity index 98%
rename from wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserVo.java
rename to wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java
index c14630f..4e446ac 100644
--- a/wms-biz/src/main/java/com/yxt/wms/feign/user/sysuser/SysUserVo.java
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java
@@ -1,4 +1,4 @@
-package com.yxt.wms.feign.user.sysuser;
+package com.yxt.wms.feign.portal.sysuser;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuserrole/SysUserRoleFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuserrole/SysUserRoleFeign.java
new file mode 100644
index 0000000..67e6aad
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuserrole/SysUserRoleFeign.java
@@ -0,0 +1,81 @@
+package com.yxt.wms.feign.portal.sysuserrole;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysuserrole.SysUserRoleDto;
+import com.yxt.wms.biz.func.sysuserrole.SysUserRoleQuery;
+import com.yxt.wms.biz.func.sysuserrole.SysUserRoleVo;
+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: anrui_portal(门户建设) <br/>
+ * File: SysUserRoleFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign <br/>
+ * Description: 用户与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "用户与角色关联表")
+@FeignClient(
+        contextId = "ss-common-portal-SysUserRole",
+        name = "ss-common-portal",
+        path = "/apiadmin/sysuserrole",
+        fallback = SysUserRoleFeignFallback.class)
+public interface SysUserRoleFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysUserRoleVo>> listPage(@RequestBody PagerQuery<SysUserRoleQuery> pq);
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<SysUserRoleVo>> listAll(@RequestBody SysUserRoleQuery query);
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<SysUserRoleVo>> list();
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysUserRoleDto dto);
+      
+    @ApiOperation("修改保存")
+    @PostMapping("/update")
+    public ResultBean update(@RequestBody SysUserRoleDto dto);
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids);
+
+    @ApiOperation("根据用户sid和角色sid删除记录")
+    @GetMapping("/delByUserSidAndRoleSid/{userSid}/{roleSid}")
+    public ResultBean delByUserSidAndRoleSid(@PathVariable("userSid")String userSid,
+                                             @PathVariable("roleSid")String roleSid);
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<SysUserRoleVo> fetch(@PathVariable("id") String id);
+
+    @ApiOperation("根据用户sid查询用户角色sid列表")
+    @GetMapping("/getUserRoleSidByUserSid/{userSid}")
+    public ResultBean<List<String>> getUserRoleSidByUserSid(@PathVariable("userSid") String userSid);
+
+    @ApiOperation("根据角色sid查询用户id列表")
+    @GetMapping("/getUserIdListByRoleSid")
+    public ResultBean<List<String>> getUserIdListByRoleSid(@RequestParam("roleList") List<String> roleList);
+
+    @ApiOperation("查询用户的角色")
+    @GetMapping("/selectByUserSid")
+    ResultBean<List<String>> selectByUserSid(@RequestParam("userSid") String userSid);
+}
\ No newline at end of file
diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuserrole/SysUserRoleFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuserrole/SysUserRoleFeignFallback.java
new file mode 100644
index 0000000..8641002
--- /dev/null
+++ b/wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuserrole/SysUserRoleFeignFallback.java
@@ -0,0 +1,83 @@
+package com.yxt.wms.feign.portal.sysuserrole;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysuserrole.SysUserRoleDto;
+import com.yxt.wms.biz.func.sysuserrole.SysUserRoleQuery;
+import com.yxt.wms.biz.func.sysuserrole.SysUserRoleVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserRoleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeignFallback <br/>
+ * Description: 用户与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class SysUserRoleFeignFallback implements SysUserRoleFeign {
+
+	@Override
+	public ResultBean<PagerVo<SysUserRoleVo>> listPage(PagerQuery<SysUserRoleQuery> pq) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<SysUserRoleVo>> listAll(SysUserRoleQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<SysUserRoleVo>> list() {
+		return null;
+	}
+
+	@Override
+	public ResultBean save(SysUserRoleDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean update(SysUserRoleDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean del(String ids) {
+		return null;
+	}
+
+	@Override
+	public ResultBean delByUserSidAndRoleSid(String userSid, String roleSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<SysUserRoleVo> fetch(String id) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<String>> getUserRoleSidByUserSid(String userSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<String>> getUserIdListByRoleSid(List<String> roleList) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<String>> selectByUserSid(String userSid) {
+		return null;
+	}
+}
\ No newline at end of file