Merge branch 'master' into yyk

yyk

2024-08-22 1310b47a24f0cc70f0128c820bd490dca6a1a921

 Wms/Wms/Controllers/BasisController.cs

@@ -325,7 +325,6 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<List<FunctionMenuDto>> GetRBACLists(int id)
        {
            return await _rBACServer.GetMenuByroleIdNew(id);
@@ -1221,7 +1220,6 @@
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<SqlSugarPagedList> GetSysOperationList(GetOperationVm model)
        {
            return await _operation.GetSysOperationList(model);
@@ -1233,7 +1231,6 @@
        /// <param name="dicName">字典名称</param>
        /// <returns></returns>
        [HttpGet]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<List<SysDictionary>> GetDicTypeList(string dicName)
        {
            return await _operation.GetDicTypeList(dicName);