Merge branch 'master' into yyk

yyk

2024-08-22 1310b47a24f0cc70f0128c820bd490dca6a1a921

 Wms/WMS.IBLL/ISysServer/IFunSettingServer.cs

@@ -19,21 +19,21 @@
        /// <param name="IsEnable">开启状态</param>
        /// <param name="GroupNo">组号</param>
        /// <returns></returns>
        List<FunSettingDto> GetFunSettingList(string FunSetName, string IsEnable, string GroupNo);
        Task<List<FunSettingDto>> GetFunSettingList(string FunSetName, string IsEnable, string GroupNo);

        /// <summary>
        /// 根据id查询功能设定信息
        /// </summary>
        /// <param name="id">功能id</param>
        /// <returns></returns>
        SysFunSetting GetFunSettingById(int id);
        Task<SysFunSetting> GetFunSettingById(int id);

        /// <summary>
        /// 根据编号查询功能设定消息
        /// </summary>
        /// <param name="funSetNo">功能编号</param>
        /// <returns></returns>
        SysFunSetting GetFunSettingByNo(string funSetNo);
        Task<SysFunSetting> GetFunSettingByNo(string funSetNo);

        /// <summary>
        /// 新增功能信息