Merge branch 'master' into yyk

yyk

2024-08-22 1310b47a24f0cc70f0128c820bd490dca6a1a921

 Wms/Utility/Filter/CustomerExceptionFilter.cs

@@ -28,11 +28,11 @@
            // 如果异常没有被处理则进行处理
            if (context.ExceptionHandled == false)
            {
                var result = "系统异常，请联系管理员";
                if (context.Exception is AppFriendlyException)
                    result = context.Exception.Message;
                //var result = "系统异常，请联系管理员";
                //if (context.Exception is AppFriendlyException)
                var result = context.Exception.Message;
                var apiResponse = new ApiResponse<object>(
                        code: (int)ResponseEnum.Error,
                        code: (int)ResponseEnum.Fail,
                        message: result,
                        data: result
                    );