diff --git a/ARW.Model/Dto/Business/Customers/CustomerDto.cs b/ARW.Model/Dto/Business/Customers/CustomerDto.cs
index 0fb54dd..f9c74db 100644
--- a/ARW.Model/Dto/Business/Customers/CustomerDto.cs
+++ b/ARW.Model/Dto/Business/Customers/CustomerDto.cs
@@ -7,28 +7,87 @@ namespace ARW.Model.Dto.Business.Customers
 {
     /// <summary>
     /// 小程序客户输入对象
+    ///
+    /// @author 黎文豪
+    /// @date 2023-06-05
     /// </summary>
     public class CustomerDto
     {
+
         public int CustomerId { get; set; }
+
         public long CustomerGuid { get; set; }
-        public string CustomerName { get; set; }
-        public string CustomerBirth { get; set; }
-        public string CustomerImg { get; set; }
-        public int? CustomerSex { get; set; }
-        public string CustomerPhone { get; set; }
+
+        public int? CustomerProvinceId { get; set; }
+
+        public int? CustomerCityId { get; set; }
+
+        public int? CustomerAreaId { get; set; }
+
+        public long? CustomerDefaultAddressGuid { get; set; }
+
+        public long? CustomerMemberLevelGuid { get; set; }
+
+        [Required(ErrorMessage = "小程序openid不能为空")]
         public string CustomerXcxOpenid { get; set; }
-        public string CustomerXcxName { get; set; }
-        public string CustomerXcxImg { get; set; }
+
+        [Required(ErrorMessage = "昵称不能为空")]
+        public string CustomerNickname { get; set; }
+
+        [Required(ErrorMessage = "手机号不能为空")]
+        public string CustomerMobilePhoneNumber { get; set; }
+
+        [Required(ErrorMessage = "头像不能为空")]
+        public string CustomerAvatar { get; set; }
+
+        [Required(ErrorMessage = "性别(字典)不能为空")]
+        public int CustomerGender { get; set; }
+
+        [Required(ErrorMessage = "可用余额不能为空")]
+        public decimal CustomerAvailableBalance { get; set; }
+
+        [Required(ErrorMessage = "可用积分不能为空")]
+        public decimal CustomerAvailablePoints { get; set; }
+
+        [Required(ErrorMessage = "总支付金额不能为空")]
+        public decimal CustomerTotalPaymentAmount { get; set; }
+
+        [Required(ErrorMessage = "实际消费金额不能为空")]
+        public decimal CustomerActualConsumptionAmount { get; set; }
+
+        [Required(ErrorMessage = "最后登录时间不能为空")]
+        public DateTime? CustomerLastLoginTime { get; set; }
+
+
+
+
+
     }
 
 
     /// <summary>
     /// 小程序客户查询对象
+    ///
+    /// @author 黎文豪
+    /// @date 2023-06-05
     /// </summary>
     public class CustomerQueryDto : PagerInfo 
     {
-        public string CustomerName { get; set; }
-        public string CustomerXcxName { get; set; }
+
+        public string CustomerXcxOpenid { get; set; }
+
+        public string CustomerNickname { get; set; }
+
+        public string CustomerMobilePhoneNumber { get; set; }
+
+        public DateTime? BeginTime { get; set; }
+
+        public DateTime? EndTime { get; set; }
+    
+        public string ids { get; set; }
     }
+
+
+
+
 }
diff --git a/ARW.Model/Models/Business/Customers/Customer.cs b/ARW.Model/Models/Business/Customers/Customer.cs
index 5b23b64..9c2d241 100644
--- a/ARW.Model/Models/Business/Customers/Customer.cs
+++ b/ARW.Model/Models/Business/Customers/Customer.cs
@@ -9,8 +9,8 @@ namespace ARW.Model.Models.Business.Customers
     /// <summary>
     /// 小程序客户，数据实体对象
     ///
-    /// @author admin
-    /// @date 2022-12-06
+    /// @author 黎文豪
+    /// @date 2023-06-05
     /// </summary>
     [SugarTable("tb_customer")]
     public class Customer : BusinessBase
@@ -24,6 +24,7 @@ namespace ARW.Model.Models.Business.Customers
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnName = "customer_id")]
         public int CustomerId { get; set; }
 
+
         /// <summary>
         /// 描述 : 
         /// 空值 : false  
@@ -33,68 +34,147 @@ namespace ARW.Model.Models.Business.Customers
         [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "customer_guid")]
         public long CustomerGuid { get; set; }
 
-        /// <summary>
-        /// 描述 :客户姓名 
-        /// 空值 : true  
-        /// </summary>
-        [EpplusTableColumn(Header = "客户姓名")]
-        [SugarColumn(ColumnName = "customer_name")]
-        public string CustomerName { get; set; }
 
         /// <summary>
-        /// 描述 :客户生日 
+        /// 描述 :省id 
         /// 空值 : true  
         /// </summary>
-        [EpplusTableColumn(Header = "客户生日")]
-        [SugarColumn(ColumnName = "customer_birth")]
-        public string CustomerBirth { get; set; }
+        [EpplusTableColumn(Header = "省id")]
+        [SugarColumn(ColumnName = "customer_province_id")]
+        public int? CustomerProvinceId { get; set; }
+
 
         /// <summary>
-        /// 描述 :客户头像 (人脸识别) 
+        /// 描述 :市id 
         /// 空值 : true  
         /// </summary>
-        [EpplusTableColumn(Header = "客户头像 (人脸识别)")]
-        [SugarColumn(ColumnName = "customer_img")]
-        public string CustomerImg { get; set; }
+        [EpplusTableColumn(Header = "市id")]
+        [SugarColumn(ColumnName = "customer_city_id")]
+        public int? CustomerCityId { get; set; }
+
 
         /// <summary>
-        /// 描述 :客户性别 1: 男   2: 女 
+        /// 描述 :区id 
         /// 空值 : true  
         /// </summary>
-        [EpplusTableColumn(Header = "客户性别 1: 男   2: 女")]
-        [SugarColumn(ColumnName = "customer_sex")]
-        public int? CustomerSex { get; set; }
+        [EpplusTableColumn(Header = "区id")]
+        [SugarColumn(ColumnName = "customer_area_id")]
+        public int? CustomerAreaId { get; set; }
+
 
         /// <summary>
-        /// 描述 :客户电话 
+        /// 描述 :默认收货地址guid 
         /// 空值 : true  
         /// </summary>
-        [EpplusTableColumn(Header = "客户电话")]
-        [SugarColumn(ColumnName = "customer_phone")]
-        public string CustomerPhone { get; set; }
+        [EpplusTableColumn(Header = "默认收货地址guid")]
+		[JsonConverter(typeof(ValueToStringConverter))]
+        [SugarColumn(ColumnName = "customer_default_address_guid")]
+        public long? CustomerDefaultAddressGuid { get; set; }
+
+
+        /// <summary>
+        /// 描述 :会员等级guid 
+        /// 空值 : true  
+        /// </summary>
+        [EpplusTableColumn(Header = "会员等级guid")]
+		[JsonConverter(typeof(ValueToStringConverter))]
+        [SugarColumn(ColumnName = "customer_member_level_guid")]
+        public long? CustomerMemberLevelGuid { get; set; }
+
 
         /// <summary>
         /// 描述 :小程序openid 
-        /// 空值 : true  
+        /// 空值 : false  
         /// </summary>
         [EpplusTableColumn(Header = "小程序openid")]
         [SugarColumn(ColumnName = "customer_xcx_openid")]
         public string CustomerXcxOpenid { get; set; }
 
-        /// <summary>
-        /// 描述 :小程序名称 
-        /// 空值 : true  
-        /// </summary>
-        [EpplusTableColumn(Header = "小程序名称")]
-        [SugarColumn(ColumnName = "customer_xcx_name")]
-        public string CustomerXcxName { get; set; }
 
         /// <summary>
-        /// 描述 :小程序头像 
-        /// 空值 : true  
+        /// 描述 :昵称 
+        /// 空值 : false  
         /// </summary>
-        [EpplusTableColumn(Header = "小程序头像")]
-        [SugarColumn(ColumnName = "customer_xcx_img")]
-        public string CustomerXcxImg { get; set; }
+        [EpplusTableColumn(Header = "昵称")]
+        [SugarColumn(ColumnName = "customer_nickname")]
+        public string CustomerNickname { get; set; }
+
+
+        /// <summary>
+        /// 描述 :手机号 
+        /// 空值 : false  
+        /// </summary>
+        [EpplusTableColumn(Header = "手机号")]
+        [SugarColumn(ColumnName = "customer_mobile_phone_number")]
+        public string CustomerMobilePhoneNumber { get; set; }
+
+
+        /// <summary>
+        /// 描述 :头像 
+        /// 空值 : false  
+        /// </summary>
+        [EpplusTableColumn(Header = "头像")]
+        [SugarColumn(ColumnName = "customer_avatar")]
+        public string CustomerAvatar { get; set; }
+
+
+        /// <summary>
+        /// 描述 :性别(字典) 
+        /// 空值 : false  
+        /// </summary>
+        [EpplusTableColumn(Header = "性别(字典)")]
+        [SugarColumn(ColumnName = "customer_gender")]
+        public int CustomerGender { get; set; }
+
+
+        /// <summary>
+        /// 描述 :可用余额 
+        /// 空值 : false  
+        /// </summary>
+        [EpplusTableColumn(Header = "可用余额")]
+        [SugarColumn(ColumnName = "customer_available_balance")]
+        public decimal CustomerAvailableBalance { get; set; }
+
+
+        /// <summary>
+        /// 描述 :可用积分 
+        /// 空值 : false  
+        /// </summary>
+        [EpplusTableColumn(Header = "可用积分")]
+        [SugarColumn(ColumnName = "customer_available_points")]
+        public decimal CustomerAvailablePoints { get; set; }
+
+
+        /// <summary>
+        /// 描述 :总支付金额 
+        /// 空值 : false  
+        /// </summary>
+        [EpplusTableColumn(Header = "总支付金额")]
+        [SugarColumn(ColumnName = "customer_total_payment_amount")]
+        public decimal CustomerTotalPaymentAmount { get; set; }
+
+
+        /// <summary>
+        /// 描述 :实际消费金额 
+        /// 空值 : false  
+        /// </summary>
+        [EpplusTableColumn(Header = "实际消费金额")]
+        [SugarColumn(ColumnName = "customer_actual_consumption_amount")]
+        public decimal CustomerActualConsumptionAmount { get; set; }
+
+
+        /// <summary>
+        /// 描述 :最后登录时间 
+        /// 空值 : false  
+        /// </summary>
+        [EpplusTableColumn(Header = "最后登录时间", NumberFormat = "yyyy-MM-dd HH:mm:ss")]
+        [SugarColumn(ColumnName = "customer_last_login_time")]
+        public DateTime? CustomerLastLoginTime { get; set; }
+
+
+
+
+
+
     }
 }
\ No newline at end of file
diff --git a/ARW.Model/Vo/Business/Customers/CustomerVo.cs b/ARW.Model/Vo/Business/Customers/CustomerVo.cs
index ba94d75..3aca6b8 100644
--- a/ARW.Model/Vo/Business/Customers/CustomerVo.cs
+++ b/ARW.Model/Vo/Business/Customers/CustomerVo.cs
@@ -1,42 +1,108 @@
 using Newtonsoft.Json;
 using OfficeOpenXml.Attributes;
 using SqlSugar;
+using System;
 
 namespace ARW.Model.Vo.Business.Customers
 {
     /// <summary>
     /// 小程序客户展示对象
+    ///
+    /// @author 黎文豪
+    /// @date 2023-06-05
     /// </summary>
     public class CustomerVo
     {
 
+
+        /// <summary>
+        /// 描述 : 
+        /// </summary>
 		[EpplusIgnore]
-        [EpplusTableColumn(Header = "CustomerId")]
         public int CustomerId { get; set; }
 
-		[EpplusIgnore]
+
+        /// <summary>
+        /// 描述 : 
+        /// </summary>
 		[JsonConverter(typeof(ValueToStringConverter))]
-        [EpplusTableColumn(Header = "CustomerGuid")]
+		[EpplusIgnore]
         public long CustomerGuid { get; set; }
-        [EpplusTableColumn(Header = "客户姓名")]
-        public string CustomerName { get; set; }
 
-        [EpplusTableColumn(Header = "客户生日")]
-        public string CustomerBrithday { get; set; }
 
-        [EpplusTableColumn(Header = "客户性别")]
-        public int? CustomerSex { get; set; }
 
-        [EpplusTableColumn(Header = "客户图片")]
-        public string CustomerImg { get; set; }
 
-        [EpplusTableColumn(Header = "客户电话")]
-        public string CustomerPhone { get; set; }
+
+
+
+        /// <summary>
+        /// 描述 :小程序openid 
+        /// </summary>
         [EpplusTableColumn(Header = "小程序openid")]
         public string CustomerXcxOpenid { get; set; }
-        [EpplusTableColumn(Header = "小程序名称")]
-        public string CustomerXcxName { get; set; }
-        [EpplusTableColumn(Header = "小程序头像")]
-        public string CustomerXcxImg { get; set; }
+
+
+        /// <summary>
+        /// 描述 :昵称 
+        /// </summary>
+        [EpplusTableColumn(Header = "昵称")]
+        public string CustomerNickname { get; set; }
+
+
+        /// <summary>
+        /// 描述 :手机号 
+        /// </summary>
+        [EpplusTableColumn(Header = "手机号")]
+        public string CustomerMobilePhoneNumber { get; set; }
+
+
+        /// <summary>
+        /// 描述 :头像 
+        /// </summary>
+        [EpplusTableColumn(Header = "头像")]
+        public string CustomerAvatar { get; set; }
+
+
+        /// <summary>
+        /// 描述 :性别(字典) 
+        /// </summary>
+        [EpplusTableColumn(Header = "性别(字典)")]
+        public int CustomerGender { get; set; }
+
+
+        /// <summary>
+        /// 描述 :可用余额 
+        /// </summary>
+        [EpplusTableColumn(Header = "可用余额")]
+        public decimal CustomerAvailableBalance { get; set; }
+
+
+        /// <summary>
+        /// 描述 :可用积分 
+        /// </summary>
+        [EpplusTableColumn(Header = "可用积分")]
+        public decimal CustomerAvailablePoints { get; set; }
+
+
+        /// <summary>
+        /// 描述 :总支付金额 
+        /// </summary>
+        [EpplusTableColumn(Header = "总支付金额")]
+        public decimal CustomerTotalPaymentAmount { get; set; }
+
+
+        /// <summary>
+        /// 描述 :实际消费金额 
+        /// </summary>
+        [EpplusTableColumn(Header = "实际消费金额")]
+        public decimal CustomerActualConsumptionAmount { get; set; }
+
+
+        /// <summary>
+        /// 描述 :最后登录时间 
+        /// </summary>
+        [EpplusTableColumn(Header = "最后登录时间", NumberFormat = "yyyy-MM-dd HH:mm:ss")]
+        public DateTime? CustomerLastLoginTime { get; set; }
+
     }
 }
diff --git a/ARW.Repository/Business/Customers/CustomerRepository.cs b/ARW.Repository/Business/Customers/CustomerRepository.cs
index 8534664..6ffe61c 100644
--- a/ARW.Repository/Business/Customers/CustomerRepository.cs
+++ b/ARW.Repository/Business/Customers/CustomerRepository.cs
@@ -8,8 +8,8 @@ namespace ARW.Repository.Business.Customers
     /// <summary>
     /// 小程序客户仓储
     ///
-    /// @author admin
-    /// @date 2022-12-06
+    /// @author 黎文豪
+    /// @date 2023-06-05
     /// </summary>
     [AppService(ServiceLifetime = LifeTime.Transient)]
     public class CustomerRepository : BaseRepository<Customer>
diff --git a/ARW.Service/Business/BusinessService/Customers/CustomerService.cs b/ARW.Service/Business/BusinessService/Customers/CustomerService.cs
index 2c4e718..7f0f3f1 100644
--- a/ARW.Service/Business/BusinessService/Customers/CustomerService.cs
+++ b/ARW.Service/Business/BusinessService/Customers/CustomerService.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Infrastructure;
 using ARW.Model;
 using ARW.Repository;
 using ARW.Repository.Business.Customers;
@@ -18,6 +19,9 @@ namespace ARW.Service.Business.BusinessService.Customers
 {
     /// <summary>
     /// 小程序客户接口实现类
+    ///
+    /// @author 黎文豪
+    /// @date 2023-06-05
     /// </summary>
     [AppService(ServiceType = typeof(ICustomerService), ServiceLifetime = LifeTime.Transient)]
     public class CustomerServiceImpl : BaseService<Customer>, ICustomerService
@@ -31,41 +35,77 @@ namespace ARW.Service.Business.BusinessService.Customers
 
 	#region 业务逻辑代码
 	
-	/// <summary>
-        /// 查询小程序客户列表
+		
+		/// <summary>
+        /// 查询小程序客户分页列表
         /// </summary>
-        /// <param name="parm"></param>
-        /// <returns></returns>
-        public Task<PagedInfo<CustomerVo>> GetCustomerList(CustomerQueryDto parm)
+		public Task<PagedInfo<CustomerVo>> GetCustomerList(CustomerQueryDto parm)
         {
             //开始拼装查询条件d
             var predicate = Expressionable.Create<Customer>();
 
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.CustomerName), it => it.CustomerName.Contains(parm.CustomerName));
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.CustomerXcxName), it => it.CustomerXcxName.Contains(parm.CustomerXcxName));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.CustomerXcxOpenid), it => it.CustomerXcxOpenid == parm.CustomerXcxOpenid);
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.CustomerNickname), it => it.CustomerNickname.Contains(parm.CustomerNickname));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.CustomerMobilePhoneNumber), it => it.CustomerMobilePhoneNumber.Contains(parm.CustomerMobilePhoneNumber));
+            predicate = predicate.AndIF(parm.BeginTime != null && parm.EndTime != null, it => it.CustomerLastLoginTime >= parm.BeginTime && it.CustomerLastLoginTime <= parm.EndTime);
             var query = _CustomerRepository
                 .Queryable()
                 .Where(predicate.ToExpression())
                 .OrderBy(s => s.Create_time,OrderByType.Desc)
                 .Select(s => new CustomerVo
                 {
-                  CustomerId = s.CustomerId,
+            CustomerId = s.CustomerId,
                   CustomerGuid = s.CustomerGuid,
-                  CustomerName = s.CustomerName,
-                  CustomerPhone = s.CustomerPhone,
-                  CustomerBrithday = s.CustomerBirth,
-                  CustomerImg = s.CustomerImg,
-                  CustomerSex = s.CustomerSex,
-                  CustomerXcxOpenid = s.CustomerXcxOpenid,
-                  CustomerXcxName = s.CustomerXcxName,
-                  CustomerXcxImg = s.CustomerXcxImg,
-                });
+                                                                              CustomerXcxOpenid = s.CustomerXcxOpenid,
+                  CustomerNickname = s.CustomerNickname,
+                  CustomerMobilePhoneNumber = s.CustomerMobilePhoneNumber,
+                  CustomerAvatar = s.CustomerAvatar,
+                  CustomerGender = s.CustomerGender,
+                  CustomerAvailableBalance = s.CustomerAvailableBalance,
+                  CustomerAvailablePoints = s.CustomerAvailablePoints,
+                  CustomerTotalPaymentAmount = s.CustomerTotalPaymentAmount,
+                  CustomerActualConsumptionAmount = s.CustomerActualConsumptionAmount,
+                  CustomerLastLoginTime = s.CustomerLastLoginTime,
+                                       });
                 
 
-            return query.ToPageAsync(parm);
+		return query.ToPageAsync(parm);
         }
-		
-		#endregion
+
+		/// <summary>
+        ///  添加或修改小程序客户
+        /// </summary>
+        public async Task<string> AddOrUpdateCustomer(Customer model)
+        {
+            if (model.CustomerId != 0)
+            {
+                var response = await _CustomerRepository.UpdateAsync(model);
+                return "修改成功！";
+            }
+            else
+            {
+
+                var response = await _CustomerRepository.InsertReturnSnowflakeIdAsync(model);
+                return "添加成功！";
+            }
+        }
+
+        #region Excel处理
+
+    
+        /// <summary>
+        /// Excel数据导出处理
+        /// </summary>
+        public async Task<List<CustomerVo>> HandleExportData(List<CustomerVo> data)
+        {
+            return data;
+        }
+
+        #endregion
+	
+
+
+#endregion
 
     }
 }
diff --git a/ARW.Service/Business/IBusinessService/Customers/ICustomerService.cs b/ARW.Service/Business/IBusinessService/Customers/ICustomerService.cs
index d602216..5889e61 100644
--- a/ARW.Service/Business/IBusinessService/Customers/ICustomerService.cs
+++ b/ARW.Service/Business/IBusinessService/Customers/ICustomerService.cs
@@ -10,14 +10,36 @@ using ARW.Model.Vo.Business.Customers;
 
 namespace ARW.Service.Business.IBusinessService.Customers
 {
+    /// <summary>
+    /// 小程序客户接口类
+    ///
+    /// @author 黎文豪
+    /// @date 2023-06-05
+    /// </summary>
     public interface ICustomerService : IBaseService<Customer>
     {
-        /// <summary>
+		/// <summary>
         /// 获取小程序客户分页列表
         /// </summary>
         /// <param name="parm"></param>
         /// <returns></returns>
         Task<PagedInfo<CustomerVo>> GetCustomerList(CustomerQueryDto parm);
+
 		
+		/// <summary>
+        /// 添加或修改小程序客户
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        Task<string> AddOrUpdateCustomer(Customer parm);
+
+
+
+        /// <summary>
+        /// Excel导出
+        /// </summary>
+        Task<List<CustomerVo>> HandleExportData(List<CustomerVo> data);
+
+
     }
 }
diff --git a/ARW.WebApi/Controllers/Api/Wechat/WeChatLoginController.cs b/ARW.WebApi/Controllers/Api/Wechat/WeChatLoginController.cs
index 3af4861..b0b2684 100644
--- a/ARW.WebApi/Controllers/Api/Wechat/WeChatLoginController.cs
+++ b/ARW.WebApi/Controllers/Api/Wechat/WeChatLoginController.cs
@@ -68,7 +68,7 @@ namespace ARW.WebApi.Controllers.Api.Wechat
                     LoginUser loginUser = new LoginUser
                     {
                         UserId = newUser.CustomerGuid,
-                        UserName = newUser.CustomerXcxName,
+                        UserName = newUser.CustomerNickname,
                         IsApi = true,
                     };
                     var jwt = JwtUtil.GenerateJwtToken(JwtUtil.AddClaims(loginUser), _jwtSettings.JwtSettings);
@@ -80,7 +80,7 @@ namespace ARW.WebApi.Controllers.Api.Wechat
                 LoginUser loginUser = new LoginUser
                 {
                     UserId = user.CustomerGuid,
-                    UserName = user.CustomerXcxName,
+                    UserName = user.CustomerNickname,
                     IsApi = true,
                 };
                 var jwt = JwtUtil.GenerateJwtToken(JwtUtil.AddClaims(loginUser), _jwtSettings.JwtSettings);
diff --git a/ARW.WebApi/Controllers/Business/Customers/CustomerController.cs b/ARW.WebApi/Controllers/Business/Custom/Customers/CustomerController.cs
similarity index 59%
rename from ARW.WebApi/Controllers/Business/Customers/CustomerController.cs
rename to ARW.WebApi/Controllers/Business/Custom/Customers/CustomerController.cs
index 0cfbd7c..f7d2be5 100644
--- a/ARW.WebApi/Controllers/Business/Customers/CustomerController.cs
+++ b/ARW.WebApi/Controllers/Business/Custom/Customers/CustomerController.cs
@@ -12,11 +12,18 @@ using ARW.Model.Dto.Business.Customers;
 using ARW.Service.Business.IBusinessService.Customers;
 using ARW.Admin.WebApi.Controllers;
 using ARW.Model.Models.Business.Customers;
+using ARW.Model.Vo.Business.Customers;
+using Microsoft.AspNetCore.Authorization;
+using ARW.Admin.WebApi.Framework;
 
-namespace ARW.WebApi.Controllers.Business.Customers
+
+namespace ARW.WebApi.Controllers.Business.Custom.Customers
 {
     /// <summary>
     /// 小程序客户控制器
+    ///
+    /// @author 黎文豪
+    /// @date 2023-06-05
     /// </summary>
     [Verify]
     [Route("business/[controller]")]
@@ -27,12 +34,13 @@ namespace ARW.WebApi.Controllers.Business.Customers
         /// <summary>
         /// 依赖注入
         /// </summary>
-        /// <param name="CustomerService">小程序客户小程序客户服务</param>
+        /// <param name="CustomerService">小程序客户服务</param>
         public CustomerController(ICustomerService CustomerService)
         {
             _CustomerService = CustomerService;
         }
 
+
         /// <summary>
         /// 获取小程序客户列表
         /// </summary>
@@ -40,10 +48,10 @@ namespace ARW.WebApi.Controllers.Business.Customers
         /// <returns></returns>
         [HttpGet("getCustomerList")]
         [ActionPermissionFilter(Permission = "business:customer:list")]
-        public IActionResult GetCustomerList([FromQuery] CustomerQueryDto parm)
+        public async Task<IActionResult> GetCustomerList([FromQuery] CustomerQueryDto parm)
         {
-            var res = _CustomerService.GetCustomerList(parm);
-            return SUCCESS(res.Result);
+            var res = await _CustomerService.GetCustomerList(parm);
+            return SUCCESS(res);
         }
 
         /// <summary>
@@ -54,23 +62,16 @@ namespace ARW.WebApi.Controllers.Business.Customers
         [HttpPost("addOrUpdateCustomer")]
         [ActionPermissionFilter(Permission = "business:customer:addOrUpdate")]
         [Log(Title = "添加或修改小程序客户", BusinessType = BusinessType.ADDORUPDATE)]
-        public IActionResult AddOrUpdateCustomer([FromBody] CustomerDto parm)
+        public async Task<IActionResult> AddOrUpdateCustomer([FromBody] CustomerDto parm)
         {
             if (parm == null) { throw new CustomException("请求参数错误"); }
 
-            var updateModal = parm.Adapt<Customer>().ToUpdate(HttpContext);
-            var addModal = parm.Adapt<Customer>().ToCreate(HttpContext);
+            var modal = new Customer();
+            if (parm.CustomerId != 0) modal = parm.Adapt<Customer>().ToUpdate(HttpContext);
+            else modal = parm.Adapt<Customer>().ToCreate(HttpContext);
 
-            if (parm.CustomerId != 0)
-            {
-                var response = _CustomerService.UpdateAsync(updateModal);
-                return SUCCESS("修改成功！");
-            }
-            else
-            {
-                var response = _CustomerService.InsertReturnSnowflakeIdAsync(addModal);
-                return SUCCESS("添加成功！");
-            }
+            var res = await _CustomerService.AddOrUpdateCustomer(modal);
+            return SUCCESS(res);
         }
 
         /// <summary>
@@ -85,25 +86,47 @@ namespace ARW.WebApi.Controllers.Business.Customers
             long[] idsArr = Tools.SpitLongArrary(ids);
             if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
             var response = _CustomerService.Delete(idsArr);
-            return ToResponse(response, "删除成功!");
+            return SUCCESS("删除成功!");
         }
-		
-		
-		/// <summary>
+
+
+        /// <summary>
         /// 导出小程序客户
         /// </summary>
         /// <returns></returns>
         [Log(Title = "小程序客户导出", BusinessType = BusinessType.EXPORT, IsSaveResponseData = false)]
-        [HttpGet("export")]
+        [HttpGet("exportCustomer")]
         [ActionPermissionFilter(Permission = "business:customer:export")]
-        public IActionResult ExportExcel([FromQuery] CustomerQueryDto parm)
+        public async Task<IActionResult> ExportExcel([FromQuery] CustomerQueryDto parm)
         {
             parm.PageSize = 10000;
-            var list = _CustomerService.GetCustomerList(parm).Result.Result;
+            var list = await _CustomerService.GetCustomerList(parm);
+            var data = list.Result;
 
-            string sFileName = ExportExcel(list, "Customer", "学生列表");
+            // 选中数据
+            if (!string.IsNullOrEmpty(parm.ids))
+            {
+                int[] idsArr = Tools.SpitIntArrary(parm.ids);
+                var selectDataList = new List<CustomerVo>();
+                foreach (var item in idsArr)
+                {
+                    var select_data = data.Where(s => s.CustomerId == item).First();
+                    selectDataList.Add(select_data);
+                }
+                data = selectDataList;
+            }
+
+
+
+            // 导出数据处理
+            var handleData = await _CustomerService.HandleExportData(data);
+
+            string sFileName = ExportExcel(handleData, "Customer", "小程序客户列表");
             return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName });
         }
-		
+
+
+
+
     }
 }
diff --git a/ARW.WebApi/Controllers/Business/Regions/RegionController.cs b/ARW.WebApi/Controllers/Business/Custom/Regions/RegionController.cs
similarity index 98%
rename from ARW.WebApi/Controllers/Business/Regions/RegionController.cs
rename to ARW.WebApi/Controllers/Business/Custom/Regions/RegionController.cs
index 9191e8d..3f4f4ab 100644
--- a/ARW.WebApi/Controllers/Business/Regions/RegionController.cs
+++ b/ARW.WebApi/Controllers/Business/Custom/Regions/RegionController.cs
@@ -17,7 +17,7 @@ using Microsoft.AspNetCore.Authorization;
 using ARW.Admin.WebApi.Framework;
 
 
-namespace ARW.WebApi.Controllers.Business.Regions
+namespace ARW.WebApi.Controllers.Business.Custom.Regions
 {
     /// <summary>
     /// 省市区数据表控制器
diff --git a/ARW.WebApi/appsettings.json b/ARW.WebApi/appsettings.json
index dc25d54..2b2fbac 100644
--- a/ARW.WebApi/appsettings.json
+++ b/ARW.WebApi/appsettings.json
@@ -23,7 +23,7 @@
   "DemoMode": false, //是否演示模式
   "Upload": {
     "UploadUrl": "http://localhost:8888", //本地存储资源访问路径
-    "localSavePath": "uploads" //本地上传默认文件存储目录 wwwroot/uploads
+    "localSavePath": "uploads" //本地上传默认文件存储目录 wwwroot/Uploads/uploads
   },
   //阿里云存储配置
   "AARWYUN_OSS": {
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/Add.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/Add.txt
index 06b9695..9ca1d72 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/Add.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/Add.txt
@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: (${genTable.functionName}/${genTable.tableName} 添加弹窗)
+ * @version: (1.0)
+ * @Author: (${replaceDto.Author})
+ * @Date: (${replaceDto.AddTime})
+ * @LastEditors: (${replaceDto.Author})
+ * @LastEditTime: (${replaceDto.AddTime})
+-->
 <template>
   <el-dialog v-model="props.modelValue" title="添加${genTable.functionName}信息" width="900px" @closed="closeDialog" @open="openDialog">
     <el-form ref="formRef" :model="formData" :rules="rules">
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt
deleted file mode 100644
index bfc1360..0000000
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-$foreach(column in genTable.Columns)
-$set(labelName = "")
-$set(labelDisabled = "")
-$set(columnName = column.CsharpFieldFl)
-$set(value = "item.dictValue")
-$if(column.ColumnComment != "")
-$set(labelName = column.ColumnComment)
-$else
-$set(labelName = column.CsharpFieldFl)
-$end
-$if(column.IsPk == true)
-$set(labelDisabled = ":disabled=true")
-$end
-$if(column.CsharpType == "int" || column.CsharpType == "long")
-    $set(value = "parseInt(item.dictValue)")
-$end
-
-$if(tool.CheckInputDtoNoField(column.CsharpField))
-$elseif(column.IsInsert == false && column.IsEdit == false)
-          <el-col :lg="12" v-if="opertype == 2">
-            <el-form-item label="${labelName}">{{form.${columnName}}}</el-form-item>
-          </el-col>
-$elseif(tool.CheckTree(genTable ,column.CsharpField))
-          <el-col :lg="24">
-            <el-form-item label="父级id" prop="${columnName}">
-              <treeselect v-model="form.${columnName}" :options="dataList" :normalizer="normalizer" :show-count="true" placeholder="选择上级菜单" />
-            </el-form-item>
-          </el-col>
-$elseif(column.IsPK || column.IsIncrement)
-          <el-col :lg="12">
-            <el-form-item label="${labelName}" prop="${columnName}">
-$if(column.IsIncrement == false)
-              <el-input-number v-model.number="form.${columnName}" controls-position="right" placeholder="请输入${labelName}" :disabled="title=='修改数据'"/>
-$else
-              <span v-html="form.${columnName}"/>
-$end
-            </el-form-item>
-          </el-col>
-$else
-$if(column.HtmlType == "inputNumber")
-          <el-col :lg="12">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input-number v-model.number="form.${columnName}" controls-position="right" placeholder="请输入${labelName}" ${labelDisabled}/>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "datetime")
-          <el-col :lg="12">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-date-picker v-model="form.${columnName}" type="datetime" placeholder="选择日期时间"></el-date-picker>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "imageUpload")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <UploadImage v-model="form.${columnName}" column="${columnName}" @input="handleUploadSuccess" />
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "fileUpload")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <UploadFile v-model="form.${columnName}" column="${columnName}" @input="handleUploadSuccess" />
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "radio")
-          <el-col :lg="12">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-radio-group v-model="form.${columnName}">
-                <el-radio v-for="item in ${columnName}Options" :key="item.dictValue" :label="${value}">{{item.dictLabel}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "textarea")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input type="textarea" v-model="form.${columnName}" placeholder="请输入${labelName}"/>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "editor")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <editor v-model="form.${columnName}" :min-height="200" />
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "select")
-          <el-col :lg="12">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-select v-model="form.${columnName}" placeholder="请选择${labelName}">
-                <el-option v-for="item in ${columnName}Options" :key="item.dictValue" :label="item.dictLabel" :value="${value}"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "checkbox")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-checkbox-group v-model="form.${columnName}Checked">
-                <el-checkbox v-for="item in ${columnName}Options" :key="item.dictValue" :label="item.dictValue">{{item.dictLabel}}</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-$else
-          <el-col :lg="12">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input v-model="form.${columnName}" placeholder="请输入${labelName}" ${labelDisabled}/>
-            </el-form-item>
-          </el-col>
-$end
-$end
-$end
\ No newline at end of file
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/Detail.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/Detail.txt
index 76023da..93bb71d 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/Detail.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/Detail.txt
@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: (${genTable.functionName}/${genTable.tableName} 详情弹窗)
+ * @version: (1.0)
+ * @Author: (${replaceDto.Author})
+ * @Date: (${replaceDto.AddTime})
+ * @LastEditors: (${replaceDto.Author})
+ * @LastEditTime: (${replaceDto.AddTime})
+-->
  <template>
   <el-dialog v-model="props.modelValue" title="${genTable.functionName}信息详情" width="900px" @closed="closeDialog" @open="openDialog">
     <el-form ref="formRef" :model="formData" :disabled="true">
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/Edit.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/Edit.txt
index 7be3345..492ff61 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/Edit.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/Edit.txt
@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: (${genTable.functionName}/${genTable.tableName} 编辑弹窗)
+ * @version: (1.0)
+ * @Author: (${replaceDto.Author})
+ * @Date: (${replaceDto.AddTime})
+ * @LastEditors: (${replaceDto.Author})
+ * @LastEditTime: (${replaceDto.AddTime})
+-->
 <template>
   <el-dialog v-model="props.modelValue" title="修改${genTable.functionName}信息" width="900px" @closed="closeDialog" @open="openDialog">
     <el-form ref="formRef" :model="formData" :rules="rules">
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/QueryForm.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/QueryForm.txt
deleted file mode 100644
index 396efa9..0000000
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/QueryForm.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-$foreach(column in genTable.Columns)
-$set(labelName = "")
-$set(columnName = "")
-$set(numLabel = "")
-$if(column.IsQuery == true)
-    $set(columnName = column.CsharpFieldFl)
-	$if(column.ColumnComment != "")
-		$set(labelName = column.ColumnComment)
-	$else
-		$set(labelName = column.CsharpFieldFl)
-	$end
-    $if(column.CsharpType == "int" || column.CsharpType == "long")
-        $set(numLabel = ".number")
-    $end
-
-$if(column.HtmlType == "datetime")
-      <el-form-item label="$labelName">
-        <el-date-picker v-model="dateRange${column.CsharpField}" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期" placeholder="请选择$labelName" :picker-options="{ firstDayOfWeek: 1}"></el-date-picker>
-      </el-form-item>
-$elseif(column.HtmlType == "select" || column.HtmlType == "radio")
-      <el-form-item label="${labelName}" prop="${columnName}">
-        <el-select v-model="queryParams.${columnName}" placeholder="请选择${labelName}">
-          <el-option v-for="item in ${columnName}Options" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
-        </el-select>
-      </el-form-item>
-$else
-      <el-form-item label="${labelName}" prop="${columnName}">
-        <el-input v-model${numLabel}="queryParams.${columnName}" placeholder="请输入${labelName}" />
-      </el-form-item>
-$end
-$end
-$end
\ No newline at end of file
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TableList.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TableList.txt
deleted file mode 100644
index eb32a34..0000000
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TableList.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-$foreach(column in genTable.Columns)
-$set(labelName = "")
-$set(checkboxHtml = "")
-$set(showToolTipHtml = "")
-$set(columnName = column.CsharpFieldFl)
-$if(column.CsharpType == "string" || column.HtmlType == "datetime")
-$set(showToolTipHtml = " :show-overflow-tooltip=\"true\"")
-$end
-$if(column.ColumnComment != "")
-$set(labelName = column.ColumnComment)
-$else
-$set(labelName = column.CsharpFieldFl)
-$end
-$if(column.IsList == true)
-$if(column.HtmlType == "customInput" && column.IsPk == false)
-      <el-table-column prop="${columnName}" label="${labelName}" width="90" sortable align="center">
-        <template slot-scope="scope">
-          <span v-show="editIndex != scope.${index}index" @click="editCurrRow(scope.${index}index,'rowkeY')">{{scope.row.${columnName}}}</span>
-          <el-input :id="scope.${index}index+'rowkeY'" size="mini" v-show="(editIndex == scope.${index}index)"
-            v-model="scope.row.${columnName}" @blur="handleChangeSort(scope.row)"></el-input>
-        </template>
-      </el-table-column>
-$elseif(column.HtmlType == "imageUpload")
-      <el-table-column prop="${columnName}" label="${labelName}" align="center">
-        <template slot-scope="scope">
-          <el-image class="table-td-thumb" fit="contain" :src="scope.row.${columnName}" :preview-src-list="[scope.row.${columnName}]">
-            <div slot="error"><i class="el-icon-document" /></div>
-          </el-image>
-        </template>
-      </el-table-column>
-$elseif(column.HtmlType == "checkbox" || column.HtmlType == "select" || column.HtmlType == "radio")
-      <el-table-column prop="${columnName}" label="${labelName}" align="center">
-        <template slot-scope="scope">
-$if(column.HtmlType == "checkbox")
-          <dict-tag :options="${columnName}Options" :value="scope.row.${columnName} ? scope.row.${columnName}.split(',') : []" />
-$else
-          <dict-tag :options="${columnName}Options" :value="scope.row.${columnName}" />
-$end
-        </template>
-      </el-table-column>
-$else
-      <el-table-column prop="${columnName}" label="${labelName}" align="center"${showToolTipHtml} />
-$end
-$end
-$end
\ No newline at end of file
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
index 0fc1d48..2b3ea49 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
@@ -21,6 +21,9 @@ namespace ${options.ApiControllerNamespace}.Controllers.Business.${genTable.modu
 {
     /// <summary>
     /// ${genTable.FunctionName}控制器
+    ///
+    /// @author ${replaceDto.Author}
+    /// @date ${replaceDto.AddTime}
     /// </summary>
     [Verify]
     [Route("business/[controller]")]
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TplControllersApi.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TplControllersApi.txt
index 5538416..f15c879 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TplControllersApi.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/TplControllersApi.txt
@@ -20,6 +20,9 @@ namespace ${options.ApiControllerNamespace}.Controllers.Api.${genTable.moduleNam
 {
     /// <summary>
     /// ${genTable.FunctionName}控制器Api
+    ///
+    /// @author ${replaceDto.Author}
+    /// @date ${replaceDto.AddTime}
     /// </summary>
     [Verify]
     [Route("api/[controller]")]
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TplDto.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TplDto.txt
index 31dc9c1..215d3ec 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TplDto.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/TplDto.txt
@@ -7,10 +7,14 @@ namespace ${options.DtosNamespace}.Dto.Business.${genTable.moduleName}
 {
     /// <summary>
     /// ${genTable.FunctionName}输入对象
+    ///
+    /// @author ${replaceDto.Author}
+    /// @date ${replaceDto.AddTime}
     /// </summary>
     public class ${replaceDto.ModelTypeName}Dto
     {
 $foreach(item in genTable.Columns)
+
 $if(item.IsInit != true)
 $if((item.IsInsert || item.IsEdit || item.IsPk || item.IsIncrement))
 $if(item.IsRequired)
@@ -27,14 +31,20 @@ $end
 
     /// <summary>
     /// ${genTable.FunctionName}查询对象
+    ///
+    /// @author ${replaceDto.Author}
+    /// @date ${replaceDto.AddTime}
     /// </summary>
     public class ${replaceDto.ModelTypeName}QueryDto : PagerInfo 
     {
 $foreach(item in genTable.Columns)
 $if(item.IsQuery && item.htmlType == "datetime")
+
         public DateTime? BeginTime { get; set; }
+
         public DateTime? EndTime { get; set; }
 $elseif(item.IsQuery)
+
         public $item.CsharpType$if(item.CsharpType != "string")?$end $item.CsharpField { get; set; }
 $end
 $end
@@ -44,7 +54,10 @@ $end
 
 
 $if(replaceDto.ShowBtnAudit)
-		/// <summary>
+        /// <summary>
+        ///
+        /// @author ${replaceDto.Author}
+        /// @date ${replaceDto.AddTime}
         /// 审核对象
         /// </summary>
         public class ${replaceDto.ModelTypeName}AuditDto
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TplDtoApi.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TplDtoApi.txt
index 2e2b21b..8e405ea 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TplDtoApi.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/TplDtoApi.txt
@@ -8,6 +8,9 @@ namespace ${options.DtosNamespace}.Dto.Api.${genTable.moduleName}
 
     /// <summary>
     /// ${genTable.FunctionName}查询对象Api
+    ///
+    /// @author ${replaceDto.Author}
+    /// @date ${replaceDto.AddTime}
     /// </summary>
     public class ${replaceDto.ModelTypeName}QueryDtoApi : PagerInfo 
     {
@@ -22,8 +25,11 @@ $end
     }
 	
 	
-	/// <summary>
+    /// <summary>
     /// ${genTable.FunctionName}详情输入对象Api
+    ///
+    /// @author ${replaceDto.Author}
+    /// @date ${replaceDto.AddTime}
     /// </summary>
     public class ${replaceDto.ModelTypeName}DtoApi
     {
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TplIService.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TplIService.txt
index cf40eec..9b3d3e8 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TplIService.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/TplIService.txt
@@ -10,6 +10,12 @@ using ARW.Model.Vo.Business.${genTable.moduleName};
 
 namespace ARW.Service.Business.IBusinessService.${genTable.moduleName}
 {
+    /// <summary>
+    /// ${genTable.FunctionName}接口类
+    ///
+    /// @author ${replaceDto.Author}
+    /// @date ${replaceDto.AddTime}
+    /// </summary>
     public interface I${replaceDto.ModelTypeName}Service : IBaseService<${replaceDto.ModelTypeName}>
     {
 $if(genTable.TplCategory == "tree")
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TplIServiceApi.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TplIServiceApi.txt
index 440931f..10c81af 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TplIServiceApi.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/TplIServiceApi.txt
@@ -10,6 +10,12 @@ using ARW.Model.Vo.Api.${genTable.moduleName};
 
 namespace ARW.Service.Api.IBusinessService.${genTable.moduleName}
 {
+    /// <summary>
+    /// ${genTable.FunctionName}接口类Api
+    ///
+    /// @author ${replaceDto.Author}
+    /// @date ${replaceDto.AddTime}
+    /// </summary>
     public interface I${replaceDto.ModelTypeName}ServiceApi : IBaseService<${replaceDto.ModelTypeName}>
     {
 $if(genTable.TplCategory == "tree")
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TplService.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TplService.txt
index 0d799c5..293812a 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TplService.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/TplService.txt
@@ -19,6 +19,9 @@ namespace ARW.Service.Business.BusinessService.${genTable.moduleName}
 {
     /// <summary>
     /// ${genTable.FunctionName}接口实现类
+    ///
+    /// @author ${replaceDto.Author}
+    /// @date ${replaceDto.AddTime}
     /// </summary>
     [AppService(ServiceType = typeof(I${replaceDto.ModelTypeName}Service), ServiceLifetime = LifeTime.Transient)]
     public class ${replaceDto.ModelTypeName}ServiceImpl : BaseService<${replaceDto.ModelTypeName}>, I${replaceDto.ModelTypeName}Service
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TplServiceApi.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TplServiceApi.txt
index 740dfb8..46f9b62 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TplServiceApi.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/TplServiceApi.txt
@@ -17,7 +17,10 @@ using ARW.Model.Vo.Api.${genTable.moduleName};
 namespace ARW.Service.Api.BusinessService.${genTable.moduleName}
 {
     /// <summary>
-    /// ${genTable.FunctionName}接口实现类
+    /// ${genTable.FunctionName}接口实现类Api
+    ///
+    /// @author ${replaceDto.Author}
+    /// @date ${replaceDto.AddTime}
     /// </summary>
     [AppService(ServiceType = typeof(I${replaceDto.ModelTypeName}ServiceApi), ServiceLifetime = LifeTime.Transient)]
     public class ${replaceDto.ModelTypeName}ServiceImplApi : BaseService<${replaceDto.ModelTypeName}>, I${replaceDto.ModelTypeName}ServiceApi
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
deleted file mode 100644
index 72cfae3..0000000
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
+++ /dev/null
@@ -1,394 +0,0 @@
-<!--
- * @Descripttion: (${genTable.functionName}/${genTable.remark})
- * @version: (1.0)
- * @Author: (${replaceDto.Author})
- * @Date: (${replaceDto.AddTime})
- * @LastEditors: (最后更新作者)
- * @LastEditTime: (最后更新时间)
--->
-<template>
-  <div class="app-container">
-    <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-    <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" 
-      @submit.native.prevent>
-      ${vueQueryFormHtml}
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- 工具区域 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" v-hasPermi="['${replaceDto.PermissionPrefix}:add']" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-      </el-col>
-       <el-col :span="1.5">
-        <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" :disabled="multiple" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
-      </el-col>
-$if(replaceDto.ShowBtnExport)
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['${replaceDto.PermissionPrefix}:export']">导出</el-button>
-      </el-col>
-$end
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 数据区域 -->
-    <el-table v-if="refreshTable" :data="dataList" v-loading="loading" ref="table" border highlight-current-row @selection-change="handleSelectionChange"
-      :default-expand-all="isExpandAll" row-key="${tool.FirstLowerCase(genTable.Options.TreeCode)}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column type="selection" width="50" align="center"/>
-${VueViewListContent}
-      <el-table-column label="操作" align="center" width="140">
-        <template slot-scope="scope">
-          <el-button size="mini" v-hasPermi="['${replaceDto.PermissionPrefix}:edit']" type="success" icon="el-icon-edit" title="编辑" 
-            @click="handleUpdate(scope.row)"></el-button>
-          <el-button size="mini" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" type="danger" icon="el-icon-delete" title="删除" 
-            @click="handleDelete(scope.row)"></el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-
-    <!-- 添加或修改${genTable.functionName}对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open" >
-      <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
-        <el-row :gutter="20">
-        ${VueViewFormContent}
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
-</template>
-<script>
-import { 
-  treelist${genTable.BusinessName},
-  list${genTable.BusinessName},
-  add${genTable.BusinessName},
-  del${genTable.BusinessName},
-  update${genTable.BusinessName},
-  get${genTable.BusinessName},
-$if(replaceDto.ShowBtnExport)
-  export${genTable.BusinessName},
-$end
-$if(showCustomInput)
-  changeSort
-$end
-} from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${tool.FirstLowerCase(genTable.BusinessName)}.js';
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "${genTable.BusinessName.ToLower()}",
-  components: { Treeselect },
-  data() {
-    return {
-      labelWidth: "100px",
-      formLabelWidth:"100px",
-      // 选中${replaceDto.FistLowerPk}数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 遮罩层
-      loading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-$foreach(item in genTable.Columns)
-$if(item.IsQuery == true)
-        ${item.CsharpFieldFl}: undefined,
-$end
-$end
-      },
-      // 弹出层标题
-      title: "",
-      // 操作类型 1、add 2、edit
-      opertype: 0,
-      // 是否显示弹出层
-      open: false,
-      // 是否展开，默认全部折叠
-      isExpandAll: false,
-      // 重新渲染表格状态
-      refreshTable: true,
-      // 表单参数
-      form: {},
-      columns: [
-$set(index = 0)
-$foreach(column in genTable.Columns)
-        { index: $index, key: '${column.CsharpFieldFl}', label: `${column.ColumnComment}`, checked: $if(index < 9) true $else false $end },
-$set(index = index + 1)
-$end
-      ],
-$foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox"))
-      // ${item.ColumnComment}选项列表
-      ${item.CsharpFieldFl}Options: [],
-$elseif(item.HtmlType == "datetime" && item.IsQuery == true)
-      //${item.ColumnComment}时间范围
-      dateRange${item.CsharpField}: [],
-$elseif(item.HtmlType == "customInput")
-      editIndex: -1,
-$end
-$end
-      // 数据列表
-      dataList: [],
-      // 总记录数
-      total: 0,
-      // 提交按钮是否显示
-      btnSubmitVisible: true,
-      // 表单校验
-      rules: {
-$foreach(column in genTable.Columns)
-$if(column.IsRequired && column.IsIncrement == false)
-        ${column.CsharpFieldFl}: [
-          { required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end
-$if(column.CsharpType == "int" || column.CsharpType == "long"), type: "number"$end }
-        ],
-$end
-$end
-      },
-    };
-  },
-  created() {
-    // 列表数据查询
-    this.getList();
-
-    $set(index = 0)
-    var dictParams = [
-$foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox") && item.DictType != "")
-      { dictType: "${item.DictType}", columnName: "${item.CsharpFieldFl}Options" },
-$set(index = index + 1)
-$end
-$end
-    ];
-$if(index > 0)
-    this.getDicts(dictParams).then((response) => {
-      response.data.forEach((element) => {
-        this[element.columnName] = element.list;
-      });
-    });
-$end
-  },
-  methods: {
-    // 查询数据
-    getList() {
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "datetime" && item.IsQuery == true)
-      this.addDateRange(this.queryParams, this.dateRange${item.CsharpField}, '${item.CsharpField}');
-$end
-$end
-      this.loading = true;
-      treelist${genTable.BusinessName}(this.queryParams).then(res => {
-         if (res.code == 200) {
-           this.dataList = res.data;
-           this.loading = false;
-         }
-       })
-    },
-    /** 转换菜单数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.${tool.FirstLowerCase(genTable.Options.TreeCode)},
-        label: node.${tool.FirstLowerCase(genTable.Options.TreeName)},
-        children: node.children,
-      };
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 重置数据表单
-    reset() {
-      this.form = {
-$foreach(item in genTable.Columns)
-$if((item.IsEdit || item.IsInsert))
-        $item.CsharpFieldFl: undefined,
-$end
-$if((item.HtmlType == "checkbox"))
-        ${item.CsharpFieldFl}Checked: [],
-$end
-$end
-      };
-      this.resetForm("form");
-    },
-    /** 重置查询操作 */
-    resetQuery() {
-      this.timeRange = [];
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "datetime" && item.IsQuery == true)
-      //${item.ColumnComment}时间范围
-      this.dateRange${item.CsharpField}= [];
-$end
-$end
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.${replaceDto.FistLowerPk});
-      this.single = selection.length != 1
-      this.multiple = !selection.length;
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加";
-      this.opertype = 1;
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const Ids = row.${replaceDto.FistLowerPk} || this.ids;
-
-      this.${confirm}confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
-        .then(function () {
-          return del${genTable.BusinessName}(Ids);
-        })
-        .then(() => {
-          this.handleQuery();
-          this.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.${replaceDto.FistLowerPk} || this.ids;
-      get${genTable.BusinessName}(id).then((res) => {
-        const { code, data } = res;
-        if (code == 200) {
-          this.open = true;
-          this.title = "修改数据";
-          this.opertype = 2;
-
-          this.form = {
-            ...data,
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "checkbox")
-            ${item.CsharpFieldFl}Checked: data.${item.CsharpFieldFl} ? data.${item.CsharpFieldFl}.split(',') : [],
-$end
-$end
-          };
-        }
-      });
-    },
-$if(replaceDto.UploadFile == 1)
-    //图片上传成功方法
-    handleUploadSuccess(column, filelist) {
-      this.form[column] = filelist;
-    },
-$end
-$foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox"))
-    // ${item.ColumnComment}字典翻译
-    ${item.CsharpFieldFl}Format(row, column) {
-      return this.selectDictLabel(this.${item.CsharpFieldFl}Options, row.${item.CsharpFieldFl});
-    },
-$end
-$if(item.HtmlType == "customInput")
-    // 显示编辑排序
-    editCurrRow(rowId, str) {
-      this.editIndex = rowId;
-      let id = rowId + str;
-      
-      setTimeout(() => {
-        document.getElementById(id).focus();
-      }, 100);
-    },
-    // 保存排序
-    handleChangeSort(info) {
-      this.editIndex = -1;
-      changeSort({ value: info.${item.CsharpFieldFl}, id: info.${replaceDto.FistLowerPk} }).then(
-        (response) => {
-          this.msgSuccess("修改成功");
-          this.getList();
-        }
-      );
-    },
-$end
-$end
-    /** 提交按钮 */
-    submitForm: function () {
-      this.${refs}refs["form"].validate((valid) => {
-        if (valid) {
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "checkbox")
-          this.form.${item.CsharpFieldFl} = this.form.${item.CsharpFieldFl}Checked.toString();
-$end
-$end
-          console.log(JSON.stringify(this.form));
-          
-          if (this.form.${replaceDto.FistLowerPk} != undefined && this.opertype === 2) {
-            update${genTable.BusinessName}(this.form)
-              .then((res) => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-            })
-            .catch((err) => {
-                //TODO 错误逻辑
-              });
-          } else {
-            add${genTable.BusinessName}(this.form)
-              .then((res) => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-            })
-            .catch((err) => {
-                //TODO 错误逻辑
-              });
-          }
-        }
-      });
-    },
-$if(replaceDto.ShowBtnExport)
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.${confirm}confirm("是否确认导出所有${genTable.functionName}数据项?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return export${genTable.BusinessName}(queryParams);
-        })
-        .then((response) => {
-          this.download(response.data.path);
-        });
-    },
-$end
-    //展开/折叠操作
-    toggleExpandAll() {
-      this.refreshTable = false;
-      this.isExpandAll = !this.isExpandAll;
-      this.${nextTick}nextTick(() => {
-        this.refreshTable = true;
-      });
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TplVo.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TplVo.txt
index 143af40..80a0be5 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TplVo.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/TplVo.txt
@@ -11,16 +11,20 @@ namespace ${options.DtosNamespace}.Vo.Business.${genTable.moduleName}
 {
     /// <summary>
     /// ${genTable.FunctionName}展示对象
+    ///
+    /// @author ${replaceDto.Author}
+    /// @date ${replaceDto.AddTime}
     /// </summary>
     public class ${replaceDto.ModelTypeName}Vo
     {
 $foreach(item in genTable.Columns)
 $if(item.IsInit != true)
 
+$if((item.IsList || item.IsPk))
+
         /// <summary>
         /// 描述 :${item.ColumnComment} ${item.Remark}
         /// </summary>
-$if((item.IsList || item.IsPk))
 $if(item.IsGuid)
 		[JsonConverter(typeof(ValueToStringConverter))]
 $if(genTable.TplCategory == "tree")
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TplVoApi.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TplVoApi.txt
index df27700..96b9898 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TplVoApi.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/TplVoApi.txt
@@ -10,17 +10,21 @@ $end
 namespace ${options.DtosNamespace}.Vo.Api.${genTable.moduleName}
 {
     /// <summary>
-    /// ${genTable.FunctionName}展示对象
+    /// ${genTable.FunctionName}展示对象Api
+    ///
+    /// @author ${replaceDto.Author}
+    /// @date ${replaceDto.AddTime}
     /// </summary>
     public class ${replaceDto.ModelTypeName}VoApi
     {
 $foreach(item in genTable.Columns)
 $if(item.IsInit != true)
 
+$if((item.IsList || item.IsPk))
+
         /// <summary>
         /// 描述 :${item.ColumnComment} ${item.Remark}
         /// </summary>
-$if((item.IsList || item.IsPk))
 $if(item.IsGuid)
 		[JsonConverter(typeof(ValueToStringConverter))]
 $if(genTable.TplCategory == "tree")
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
deleted file mode 100644
index fb92492..0000000
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ /dev/null
@@ -1,390 +0,0 @@
-<!--
- * @Descripttion: (${genTable.functionName}/${genTable.tableName})
- * @version: (1.0)
- * @Author: (${replaceDto.Author})
- * @Date: (${replaceDto.AddTime})
- * @LastEditors: (${replaceDto.Author})
- * @LastEditTime: (${replaceDto.AddTime})
--->
-<template>
-  <div class="app-container">
-    <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-    <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" 
-      @submit.native.prevent>
-      ${vueQueryFormHtml}
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- 工具区域 -->
-    <el-row :gutter="10" class="mb8">
-$if(replaceDto.ShowBtnAdd)
-      <el-col :span="1.5">
-        <el-button type="primary" v-hasPermi="['${replaceDto.PermissionPrefix}:add']" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-      </el-col>
-$end
-$if(replaceDto.ShowBtnEdit)
-      <el-col :span="1.5">
-        <el-button type="success" :disabled="single" v-hasPermi="['${replaceDto.PermissionPrefix}:edit']" plain icon="el-icon-edit" size="mini" @click="handleUpdate">修改</el-button>
-      </el-col>
-$end
-$if(replaceDto.ShowBtnDelete)
-      <el-col :span="1.5">
-        <el-button type="danger" :disabled="multiple" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
-      </el-col>
-$end
-$if(replaceDto.ShowBtnExport)
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['${replaceDto.PermissionPrefix}:export']">导出</el-button>
-      </el-col>
-$end
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 数据区域 -->
-    <el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="50" align="center"/>
-${VueViewListContent}
-      <el-table-column label="操作" align="center" width="140">
-        <template slot-scope="scope">
-$if(replaceDto.ShowBtnEdit)
-          <el-button size="mini" v-hasPermi="['${replaceDto.PermissionPrefix}:edit']" type="success" icon="el-icon-edit" title="编辑" 
-            @click="handleUpdate(scope.row)"></el-button>      
-$end
-$if(replaceDto.ShowBtnDelete)
-          <el-button size="mini" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" type="danger" icon="el-icon-delete" title="删除" 
-            @click="handleDelete(scope.row)"></el-button>
-$end
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-
-    <!-- 添加或修改${genTable.functionName}对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open" >
-      <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
-        <el-row :gutter="20">
-        ${VueViewFormContent}
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
-</template>
-<script>
-import { 
-  list${genTable.BusinessName},
-  add${genTable.BusinessName},
-  del${genTable.BusinessName}, 
-  update${genTable.BusinessName},
-  get${genTable.BusinessName},
-$if(replaceDto.ShowBtnExport)
-  export${genTable.BusinessName},
-$end
-$if(showCustomInput)
-  changeSort
-$end
-} from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${tool.FirstLowerCase(genTable.BusinessName)}.js';
-
-export default {
-  name: "${genTable.BusinessName.ToLower()}",
-  data() {
-    return {
-      labelWidth: "100px",
-      formLabelWidth:"100px",
-      // 选中${replaceDto.FistLowerPk}数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 遮罩层
-      loading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        sort: undefined,
-        sortType: undefined,
-$foreach(item in genTable.Columns)
-$if(item.IsQuery == true)
-        ${item.CsharpFieldFl}: undefined,
-$end
-$end
-      },
-      // 弹出层标题
-      title: "",
-      // 操作类型 1、add 2、edit
-      opertype: 0,
-      // 是否显示弹出层
-      open: false,
-      // 表单参数
-      form: {},
-      columns: [
-$set(index = 0)
-$foreach(column in genTable.Columns)
-        { index: $index, key: '${column.CsharpFieldFl}', label: `${column.ColumnComment}`, checked: $if(index < 9) true $else false $end },
-$set(index = index + 1)
-$end
-      ],
-$foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox"))
-      // ${item.ColumnComment}选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
-      ${item.CsharpFieldFl}Options: [],
-$elseif(item.HtmlType == "datetime" && item.IsQuery == true)
-      //${item.ColumnComment}时间范围
-      dateRange${item.CsharpField}: [],
-$elseif(item.HtmlType == "customInput")
-      editIndex: -1,
-$end
-$end
-      // 数据列表
-      dataList: [],
-      // 总记录数
-      total: 0,
-      // 提交按钮是否显示
-      btnSubmitVisible: true,
-      // 表单校验
-      rules: {
-$foreach(column in genTable.Columns)
-$if(column.IsRequired && column.IsIncrement == false)
-        ${column.CsharpFieldFl}: [
-          { required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end }
-        ],
-$end
-$end
-      },
-    };
-  },
-  created() {    
-    // 列表数据查询
-    this.getList();
-
-$set(index = 0)
-    var dictParams = [
-$foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox") && item.DictType != "")
-      { dictType: "${item.DictType}", columnName: "${item.CsharpFieldFl}Options" },
-$set(index = index + 1)
-$end
-$end
-    ];
-$if(index > 0)
-    this.getDicts(dictParams).then((response) => {
-      response.data.forEach((element) => {
-        this[element.columnName] = element.list;
-      });
-    });
-$end
-  },
-  methods: {
-    // 查询数据
-    getList() {
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "datetime" && item.IsQuery == true)
-      this.addDateRange(this.queryParams, this.dateRange${item.CsharpField}, '${item.CsharpField}');
-$end
-$end
-      this.loading = true;
-      list${genTable.BusinessName}(this.queryParams).then(res => {
-         if (res.code == 200) {
-           this.dataList = res.data.result;
-           this.total = res.data.totalNum;
-           this.loading = false;
-         }
-       })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 重置数据表单
-    reset() {
-      this.form = {
-$foreach(item in genTable.Columns)
-$if((item.IsEdit || item.IsInsert))
-        $item.CsharpFieldFl: undefined,
-$end
-$if((item.HtmlType == "checkbox"))
-        ${item.CsharpFieldFl}Checked: [],
-$end
-$end
-      };
-      this.resetForm("form");
-    },
-    // 重置查询操作
-    resetQuery() {
-      this.timeRange = [];
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "datetime" && item.IsQuery == true)
-      //${item.ColumnComment}时间范围
-      this.dateRange${item.CsharpField}= [];
-$end
-$end
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.{tool.FirstLowerCase(genTable.BusinessName)}Id);
-      this.single = selection.length != 1
-      this.multiple = !selection.length;
-    },
-     // 自定义排序
-    sortChange(column) {
-      if (column.prop == null || column.order == null) {
-        this.queryParams.sort = undefined;
-        this.queryParams.sortType = undefined;
-      } else {
-        this.queryParams.sort = column.prop;
-        this.queryParams.sortType = column.order;
-      }
-
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加";
-      this.opertype = 1;
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const Ids = row.${tool.FirstLowerCase(genTable.BusinessName)}Id || this.ids;
-
-      this.${confirm}confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
-        .then(function () {
-          return del${genTable.BusinessName}(Ids);
-        })
-        .then(() => {
-          this.handleQuery();
-          this.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.${replaceDto.FistLowerPk} || this.ids;
-      get${genTable.BusinessName}(id).then((res) => {
-        const { code, data } = res;
-        if (code == 200) {
-          this.open = true;
-          this.title = "修改数据";
-          this.opertype = 2;
-
-          this.form = {
-            ...data,
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "checkbox")
-            ${item.CsharpFieldFl}Checked: data.${item.CsharpFieldFl} ? data.${item.CsharpFieldFl}.split(',') : [],
-$end
-$end
-          };
-        }
-      });
-    },
-$if(replaceDto.UploadFile == 1)
-    //图片上传成功方法
-    handleUploadSuccess(column, filelist) {
-      this.form[column] = filelist;
-    },
-$end
-$foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox"))
-    // ${item.ColumnComment}字典翻译
-    ${item.CsharpFieldFl}Format(row, column) {
-      return this.selectDictLabel(this.${item.CsharpFieldFl}Options, row.${item.CsharpFieldFl});
-    },
-$end
-$if(item.HtmlType == "customInput")
-    // 显示编辑排序
-    editCurrRow(rowId, str) {
-      this.editIndex = rowId;
-      let id = rowId + str;
-      
-      setTimeout(() => {
-        document.getElementById(id).focus();
-      }, 100);
-    },
-    // 保存排序
-    handleChangeSort(info) {
-      this.editIndex = -1;
-      changeSort({ value: info.${item.CsharpFieldFl}, id: info.${replaceDto.FistLowerPk} }).then(
-        (response) => {
-          this.msgSuccess("修改成功");
-          this.getList();
-        }
-      );
-    },
-$end
-$end
-    /** 提交按钮 */
-    submitForm: function () {
-      this.${refs}refs["form"].validate((valid) => {
-        if (valid) {
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "checkbox")
-          this.form.${item.CsharpFieldFl} = this.form.${item.CsharpFieldFl}Checked.toString();
-$end
-$end
-          console.log(JSON.stringify(this.form));
-          
-          if (this.form.${replaceDto.FistLowerPk} != undefined && this.opertype === 2) {
-            update${genTable.BusinessName}(this.form)
-              .then((res) => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-            })
-            .catch((err) => {
-                //TODO 错误逻辑
-              });
-          } else {
-            add${genTable.BusinessName}(this.form)
-              .then((res) => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-            })
-            .catch((err) => {
-                //TODO 错误逻辑
-              });
-          }
-        }
-      });
-    },
-$if(replaceDto.ShowBtnExport)
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.${confirm}confirm("是否确认导出所有${genTable.functionName}数据项?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return export${genTable.BusinessName}(queryParams);
-        })
-        .then((response) => {
-          this.download(response.data.path);
-        });
-    },
-$end
-  },
-};
-</script>
\ No newline at end of file
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
index 205cd6a..05d29d6 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
@@ -1,4 +1,13 @@
 import request from '@/utils/request'
+	
+/**
+ * @Descripttion: ${genTable.functionName}Api接口
+ * @version: (1.0)
+ * @Author: (${replaceDto.Author})
+ * @Date: (${replaceDto.AddTime})
+ * @LastEditors: (${replaceDto.Author})
+ * @LastEditTime: (${replaceDto.AddTime})
+*/
 
 $if(genTable.TplCategory == "tree")
 /**
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/TplVueIndex.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/TplVueIndex.txt
index 0d53722..369068f 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/TplVueIndex.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/TplVueIndex.txt
@@ -30,7 +30,7 @@ $if(column.IsInit != true)
 $if(column.HtmlType == "datetime")
       <el-form-item label="$labelName">
         <el-date-picker 
-          v-model="dateRange${column.CsharpField}" 
+          v-model="daterange" 
           style="width: 240px" 
           type="daterange" 
           range-separator="-"
@@ -288,7 +288,13 @@ $end
   },
 })
 const { queryParams } = toRefs(data)
-
+$foreach(column in genTable.Columns)
+$if(column.IsQuery == true)
+$if(column.HtmlType == "datetime")
+  const dateRange = ref([])
+$end
+$end
+$end
 
 // 业务参数
 
@@ -370,15 +376,25 @@ $else
 // 查询数据
 function getList() {
   loading.value = true
+
+  $foreach(column in genTable.Columns)
+  $if(column.IsQuery == true)
+    $if(column.HtmlType == "datetime")
+  // ${tool.FirstLowerCase(genTable.BusinessName)}List(proxy.addDateRange(queryParams.value, dateRange.value)).then((res) => {
+    $end
+  $end
+  $end
+  $end
+
   ${tool.FirstLowerCase(genTable.BusinessName)}List(queryParams.value).then((res) => {
     if (res.code == 200) {
-      loading.value = false
-      dataList.value = res.data.result
-      total.value = res.data.totalNum
+      loading.value = false;
+      dataList.value = res.data.result;
+      total.value = res.data.totalNum;
     }
-  })
+  });
 }
-$end
+
 
 // 多选框选中数据
 function handleSelectionChange(selection) {
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/Upload.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/Upload.txt
index 3507c77..b5ccfd6 100644
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/Upload.txt
+++ b/ARW.WebApi/wwwroot/CodeGenTemplate/Upload.txt
@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: (${genTable.functionName}/${genTable.tableName}导入弹窗)
+ * @version: (1.0)
+ * @Author: (${replaceDto.Author})
+ * @Date: (${replaceDto.AddTime})
+ * @LastEditors: (${replaceDto.Author})
+ * @LastEditTime: (${replaceDto.AddTime})
+-->
 <template>
     <el-dialog title="导入" v-model="modelValue" width="400px" @closed="closeDialog">
       <el-upload
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/old/MySqlTemplate - 副本.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/old/MySqlTemplate - 副本.txt
deleted file mode 100644
index 481abec..0000000
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/old/MySqlTemplate - 副本.txt	
+++ /dev/null
@@ -1,30 +0,0 @@
-use 
-Admin;
-
--- 菜单
-INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) 
-VALUES ('${genTable.functionName}', ${parentId}, 999, '${genTable.BusinessName}', '${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName}', 0, 0, 'C', '0', '0', '${replaceDto.PermissionPrefix}:list', 'icon1', 'system', sysdate());
-
--- 按钮父菜单id
-SELECT @menuId := LAST_INSERT_ID();
-
-
-INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) 
-VALUES ('查询', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:query', '', 'system', sysdate());
-
-INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) 
-VALUES ('新增', @menuId, 2, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:add', '', 'system',  sysdate());
-
-INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) 
-VALUES ('删除', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:delete', '', 'system', sysdate());
-
-INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) 
-VALUES ('修改', @menuId, 4, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:edit', '', 'system', sysdate());
-
-$if(replaceDto.ShowBtnExport)
-INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) 
-VALUES ('导出', @menuId, 5, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:export', '', 'system', sysdate());
-$end
-
-SELECT * FROM sys_menu WHERE parentId = @menuId;
-SELECT * FROM sys_menu WHERE menuId = @menuId;
\ No newline at end of file
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/old/TplControllers.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/old/TplControllers.txt
deleted file mode 100644
index 51d5983..0000000
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/old/TplControllers.txt
+++ /dev/null
@@ -1,187 +0,0 @@
-using Infrastructure;
-using Infrastructure.Attribute;
-using Infrastructure.Enums;
-using Infrastructure.Model;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using ${options.ModelsNamespace}.Dto;
-using ${options.ModelsNamespace}.Models;
-using ${options.IServicsNamespace}.${options.SubNamespace}.I${options.SubNamespace}Service;
-using ${options.ApiControllerNamespace}.Extensions;
-using ${options.ApiControllerNamespace}.Filters;
-using ${options.BaseNamespace}Common;
-
-namespace ${options.ApiControllerNamespace}.Controllers
-{
-    /// <summary>
-    /// ${genTable.functionName}Controller
-    /// 
-    /// @tableName ${genTable.TableName}
-    /// @author ${replaceDto.Author}
-    /// @date ${replaceDto.AddTime}
-    /// </summary>
-    [Verify]
-    [Route("${genTable.ModuleName}/${genTable.BusinessName}")]
-    public class ${replaceDto.ModelTypeName}Controller : BaseController
-    {
-        /// <summary>
-        /// ${genTable.FunctionName}接口
-        /// </summary>
-        private readonly I${replaceDto.ModelTypeName}Service _${replaceDto.ModelTypeName}Service;
-
-        public ${replaceDto.ModelTypeName}Controller(I${replaceDto.ModelTypeName}Service ${replaceDto.ModelTypeName}Service)
-        {
-            _${replaceDto.ModelTypeName}Service = ${replaceDto.ModelTypeName}Service;
-        }
-
-        /// <summary>
-        /// 查询${genTable.FunctionName}列表
-        /// </summary>
-        /// <param name="parm"></param>
-        /// <returns></returns>
-        [HttpGet("list")]
-        [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:list")]
-        public IActionResult Query${replaceDto.ModelTypeName}([FromQuery] ${replaceDto.ModelTypeName}QueryDto parm)
-        {
-            var response = _${replaceDto.ModelTypeName}Service.GetList(parm);
-            return SUCCESS(response);
-        }
-
-$if(genTable.TplCategory == "tree")
-        /// <summary>
-        /// 查询${genTable.FunctionName}列表树
-        /// </summary>
-        /// <param name="parm"></param>
-        /// <returns></returns>
-        [HttpGet("treeList")]
-        [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:list")]
-        public IActionResult QueryTree${replaceDto.ModelTypeName}([FromQuery] ${replaceDto.ModelTypeName}QueryDto parm)
-        {
-            var response = _${replaceDto.ModelTypeName}Service.GetTreeList(parm);
-            return SUCCESS(response);
-        }
-$end
-
-        /// <summary>
-        /// 查询${genTable.FunctionName}详情
-        /// </summary>
-        /// <param name="${replaceDto.PKName}"></param>
-        /// <returns></returns>
-        [HttpGet("{${replaceDto.PKName}}")]
-        [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:query")]
-        public IActionResult Get${replaceDto.ModelTypeName}(${replaceDto.PKType} ${replaceDto.PKName})
-        {
-            var response = _${replaceDto.ModelTypeName}Service.GetFirst(x => x.${replaceDto.PKName} == ${replaceDto.PKName});
-            
-            return SUCCESS(response);
-        }
-
-$if(replaceDto.ShowBtnAdd)
-        /// <summary>
-        /// 添加${genTable.FunctionName}
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:add")]
-        [Log(Title = "${genTable.FunctionName}", BusinessType = BusinessType.INSERT)]
-        public IActionResult Add${replaceDto.ModelTypeName}([FromBody] ${replaceDto.ModelTypeName}Dto parm)
-        {
-            if (parm == null)
-            {
-                throw new CustomException("请求参数错误");
-            }
-            var modal = parm.Adapt<${replaceDto.ModelTypeName}>().ToCreate(HttpContext);
-
-            var response = _${replaceDto.ModelTypeName}Service.Add${replaceDto.ModelTypeName}(modal);
-
-            return ToResponse(response);
-        }
-$end
-
-$if(replaceDto.ShowBtnEdit)
-        /// <summary>
-        /// 更新${genTable.FunctionName}
-        /// </summary>
-        /// <returns></returns>
-        [HttpPut]
-        [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:edit")]
-        [Log(Title = "${genTable.FunctionName}", BusinessType = BusinessType.UPDATE)]
-        public IActionResult Update${replaceDto.ModelTypeName}([FromBody] ${replaceDto.ModelTypeName}Dto parm)
-        {
-            if (parm == null)
-            {
-                throw new CustomException("请求实体不能为空");
-            }
-            var modal = parm.Adapt<${replaceDto.ModelTypeName}>().ToUpdate(HttpContext);
-
-            var response = _${replaceDto.ModelTypeName}Service.Update${replaceDto.ModelTypeName}(modal);
-
-            return ToResponse(response);
-        }
-$end
-
-$if(replaceDto.ShowBtnDelete)
-        /// <summary>
-        /// 删除${genTable.FunctionName}
-        /// </summary>
-        /// <returns></returns>
-        [HttpDelete("{ids}")]
-        [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:delete")]
-        [Log(Title = "${genTable.FunctionName}", BusinessType = BusinessType.DELETE)]
-        public IActionResult Delete${replaceDto.ModelTypeName}(string ids)
-        {
-            int[] idsArr = Tools.SpitIntArrary(ids);
-            if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
-
-            var response = _${replaceDto.ModelTypeName}Service.Delete(idsArr);
-
-            return ToResponse(response);
-        }
-$end
-
-$if(replaceDto.ShowBtnExport)
-        /// <summary>
-        /// 导出${genTable.FunctionName}
-        /// </summary>
-        /// <returns></returns>
-        [Log(Title = "${genTable.FunctionName}", BusinessType = BusinessType.EXPORT, IsSaveResponseData = false)]
-        [HttpGet("export")]
-        [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:export")]
-        public IActionResult Export([FromQuery] ${replaceDto.ModelTypeName}QueryDto parm)
-        {
-            parm.PageSize = 10000;
-            var list = _${replaceDto.ModelTypeName}Service.GetList(parm).Result;
-
-            string sFileName = ExportExcel(list, "${replaceDto.ModelTypeName}", "${genTable.FunctionName}");
-            return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName });
-        }
-$end
-
-$if(showCustomInput)
-        /// <summary>
-        /// 保存排序
-        /// </summary>
-        /// <param name="id">主键</param>
-        /// <param name="value">排序值</param>
-        /// <returns></returns>
-        [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:edit")]
-        [HttpGet("ChangeSort")]
-        [Log(Title = "保存排序", BusinessType = BusinessType.UPDATE)]
-        public IActionResult ChangeSort(int id = 0, int value = 0)
-        {
-            if (id <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
-            var response = _${replaceDto.ModelTypeName}Service.Update(w => w.${replaceDto.PKName} == id, it => new ${replaceDto.ModelTypeName}()
-            {
-                //Update 字段映射
-$foreach(item in genTable.Columns)
-$if((item.htmlType == "customInput"))
-                $item.CsharpField = value,
-$end
-${end}
-            });
-            
-            return ToResponse(response);
-        }
-$end
-    }
-}
\ No newline at end of file
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/old/TplIService.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/old/TplIService.txt
deleted file mode 100644
index f30aecd..0000000
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/old/TplIService.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using ${options.ModelsNamespace};
-using ${options.ModelsNamespace}.Dto;
-using ${options.ModelsNamespace}.Models;
-using System.Collections.Generic;
-
-namespace ${options.IServicsNamespace}.${options.SubNamespace}.I${options.SubNamespace}Service
-{
-    /// <summary>
-    /// ${genTable.FunctionName}service接口
-    ///
-    /// @author ${replaceDto.Author}
-    /// @date ${replaceDto.AddTime}
-    /// </summary>
-    public interface I${replaceDto.ModelTypeName}Service : IBaseService<${replaceDto.ModelTypeName}>
-    {
-        PagedInfo<${replaceDto.ModelTypeName}> GetList(${replaceDto.ModelTypeName}QueryDto parm);
-
-$if(genTable.TplCategory == "tree")
-        List<${replaceDto.ModelTypeName}> GetTreeList(${replaceDto.ModelTypeName}QueryDto parm);
-$end
-        int Add${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} parm);
-
-        int Update${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} parm);
-    }
-}
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/old/TplService.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/old/TplService.txt
deleted file mode 100644
index ce428f3..0000000
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/old/TplService.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-using System;
-using SqlSugar;
-using System.Collections.Generic;
-using Infrastructure;
-using Infrastructure.Attribute;
-using ${options.ModelsNamespace};
-using ${options.ModelsNamespace}.Dto;
-using ${options.ModelsNamespace}.Models;
-using ${options.IRepositoriesNamespace};
-using ${options.IServicsNamespace}.${options.SubNamespace}.I${options.SubNamespace}Service;
-
-namespace ${options.ServicesNamespace}.${options.SubNamespace}
-{
-    /// <summary>
-    /// ${genTable.FunctionName}Service业务层处理
-    ///
-    /// @author ${replaceDto.Author}
-    /// @date ${replaceDto.AddTime}
-    /// </summary>
-    [AppService(ServiceType = typeof(I${replaceDto.ModelTypeName}Service), ServiceLifetime = LifeTime.Transient)]
-    public class ${replaceDto.ModelTypeName}Service : BaseService<${replaceDto.ModelTypeName}>, I${replaceDto.ModelTypeName}Service
-    {
-        private readonly ${replaceDto.ModelTypeName}Repository _${replaceDto.ModelTypeName}Repository;
-        public ${replaceDto.ModelTypeName}Service(${replaceDto.ModelTypeName}Repository repository)
-        {
-            _${replaceDto.ModelTypeName}Repository = repository;
-        }
-
-        #region 业务逻辑代码
-
-        /// <summary>
-        /// 查询${genTable.FunctionName}列表
-        /// </summary>
-        /// <param name="parm"></param>
-        /// <returns></returns>
-        public PagedInfo<${replaceDto.ModelTypeName}> GetList(${replaceDto.ModelTypeName}QueryDto parm)
-        {
-            //开始拼装查询条件
-            var predicate = Expressionable.Create<${replaceDto.ModelTypeName}>();
-
-            //搜索条件查询语法参考Sqlsugar
-$foreach(column in genTable.Columns)
-$if(column.IsQuery)
-$if(column.CsharpType == "string")
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.${column.CsharpField}), ${codeTool.QueryExp(column.CsharpField, column.QueryType)};
-$elseif(column.CsharpType == "DateTime")
-            predicate = predicate.AndIF(parm.Begin${column.CsharpField} == null, it => it.${column.CsharpField} >= DateTime.Now.AddDays(-1));
-            predicate = predicate.AndIF(parm.Begin${column.CsharpField} != null, it => it.${column.CsharpField} >= parm.Begin${column.CsharpField} && it.${column.CsharpField} <= parm.End${column.CsharpField});
-$elseif(column.CsharpType == "int" || column.CsharpType == "long")
-            predicate = predicate.AndIF(parm.${column.CsharpField} != null, ${codeTool.QueryExp(column.CsharpField, column.QueryType)};
-$end
-$end
-$end
-            var response = _${replaceDto.ModelTypeName}Repository
-                .Queryable()
-$if(null != genTable.SubTableName && "" != genTable.SubTableName)
-                .Includes(it => it.${genTable.SubTable.ClassName}.MappingField(z => z.${genTable.SubTableFkName}, () => it.${replaceDto.PKName}))
-$end
-$if(genTable.Options.SortField != "" && genTable.Options.SortField != null)
-                .OrderBy("${genTable.Options.SortField} ${genTable.Options.SortType}")
-$end
-                .Where(predicate.ToExpression())
-                .ToPage(parm);
-
-            return response;
-        }
-
-$if(genTable.TplCategory == "tree")
-        /// <summary>
-        /// 查询${genTable.FunctionName}树列表
-        /// </summary>
-        /// <param name="parm"></param>
-        /// <returns></returns>
-        public List<${replaceDto.ModelTypeName}> GetTreeList(${replaceDto.ModelTypeName}QueryDto parm)
-        {
-            //开始拼装查询条件
-            var predicate = Expressionable.Create<${replaceDto.ModelTypeName}>();
-
-            //搜索条件查询语法参考Sqlsugar
-$foreach(column in genTable.Columns)
-$if(column.IsQuery)
-$if(column.CsharpType == "string")
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.${column.CsharpField}), ${codeTool.QueryExp(column.CsharpField, column.QueryType)};
-$elseif(column.CsharpType == "int" || column.CsharpType == "long")
-            predicate = predicate.AndIF(parm.${column.CsharpField} != null, ${codeTool.QueryExp(column.CsharpField, column.QueryType)};
-$end
-$end
-$end
-
-            var response = _${replaceDto.ModelTypeName}Repository.Queryable().Where(predicate.ToExpression())
-                .ToTree(it => it.Children, it => it.${genTable.Options.TreeParentCode}, 0);
-
-            return response;
-        }
-$end
-        /// <summary>
-        /// 添加${genTable.FunctionName}
-        /// </summary>
-        /// <param name="parm"></param>
-        /// <returns></returns>
-        public int Add${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} parm)
-        {
-            var response = _${replaceDto.ModelTypeName}Repository.Insert(parm, it => new
-            {
-${foreach(item in genTable.Columns)}
-$if((item.IsInsert))
-                it.$item.CsharpField,
-$end
-${end}
-            });
-            return response;
-        }
-
-        /// <summary>
-        /// 修改${genTable.FunctionName}
-        /// </summary>
-        /// <param name="parm"></param>
-        /// <returns></returns>
-        public int Update${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} parm)
-        {
-            var response = _${replaceDto.ModelTypeName}Repository.Update(w => w.${replaceDto.PKName} == parm.${replaceDto.PKName}, it => new ${replaceDto.ModelTypeName}()
-            {
-$foreach(item in genTable.Columns)
-$if((item.IsEdit))
-                $item.CsharpField = parm.$item.CsharpField,
-$end
-${end}
-            });
-            return response;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/old/TplVueApi.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/old/TplVueApi.txt
deleted file mode 100644
index 48d25b9..0000000
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/old/TplVueApi.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-import request from '@/utils/request'
-
-/**
-* ${genTable.functionName}分页查询
-* @param {查询条件} data
-*/
-export function list${genTable.BusinessName}(query) {
-  return request({
-    url: '${genTable.ModuleName}/${genTable.BusinessName}/list',
-    method: 'get',
-    params: query,
-  })
-}
-
-$if(genTable.TplCategory == "tree")
-/**
-* ${genTable.functionName}tree查询
-* @param {查询条件} data
-*/
-export function treelist${genTable.BusinessName}(query) {
-  return request({
-    url: '${genTable.ModuleName}/${genTable.BusinessName}/treelist',
-    method: 'get',
-    params: query,
-  })
-}
-$end
-
-/**
-* 新增${genTable.functionName}
-* @param data
-*/
-export function add${genTable.BusinessName}(data) {
-  return request({
-    url: '${genTable.ModuleName}/${genTable.BusinessName}',
-    method: 'post',
-    data: data,
-  })
-}
-
-/**
-* 修改${genTable.functionName}
-* @param data
-*/
-export function update${genTable.BusinessName}(data) {
-  return request({
-    url: '${genTable.ModuleName}/${genTable.BusinessName}',
-    method: 'PUT',
-    data: data,
-  })
-}
-
-/**
-* 获取${genTable.functionName}详情
-* @param {Id}
-*/
-export function get${genTable.BusinessName}(id) {
-  return request({
-    url: '${genTable.ModuleName}/${genTable.BusinessName}/' + id,
-    method: 'get'
-  })
-}
-
-/**
-* 删除${genTable.functionName}
-* @param {主键} pid
-*/
-export function del${genTable.BusinessName}(pid) {
-  return request({
-    url: '${genTable.ModuleName}/${genTable.BusinessName}/' + pid,
-    method: 'delete'
-  })
-}
-
-// 导出${genTable.functionName}
-export function export${genTable.BusinessName}(query) {
-  return request({
-    url: '${genTable.ModuleName}/${genTable.BusinessName}/export',
-    method: 'get',
-    params: query
-  })
-}
-
-$if(showCustomInput)
-//排序
-export function changeSort(data) {
-  return request({
-    url: '${genTable.ModuleName}/${genTable.BusinessName}/ChangeSort',
-    method: 'get',
-    params: data
-  })
-}
-$end
\ No newline at end of file
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
deleted file mode 100644
index dc05b23..0000000
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
+++ /dev/null
@@ -1,565 +0,0 @@
-<!--
- * @Descripttion: (${genTable.functionName}/${genTable.tableName})
- * @version: (1.0)
- * @Author: (${replaceDto.Author})
- * @Date: (${replaceDto.AddTime})
- * @LastEditors: (${replaceDto.Author})
- * @LastEditTime: (${replaceDto.AddTime})
--->
-<template>
-  <div class="app-container">
-    <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-    <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" 
-      @submit.prevent>
-$foreach(column in genTable.Columns)
-$set(labelName = "")
-$set(columnName = "")
-$set(numLabel = "")
-$if(column.IsQuery == true)
-    $set(columnName = column.CsharpFieldFl)
-	$if(column.ColumnComment != "")
-		$set(labelName = column.ColumnComment)
-	$else
-		$set(labelName = column.CsharpFieldFl)
-	$end
-    $if(column.CsharpType == "int" || column.CsharpType == "long")
-        $set(numLabel = ".number")
-    $end
-
-$if(column.HtmlType == "datetime")
-      <el-form-item label="$labelName">
-        <el-date-picker v-model="dateRange${column.CsharpField}" style="width: 240px" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期" placeholder="请选择$labelName" :picker-options="{ firstDayOfWeek: 1}"></el-date-picker>
-      </el-form-item>
-$elseif(column.HtmlType == "select" || column.HtmlType == "radio")
-      <el-form-item label="${labelName}" prop="${columnName}">
-        <el-select v-model="queryParams.${columnName}" placeholder="请选择${labelName}">
-          <el-option v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
-        </el-select>
-      </el-form-item>
-$else
-      <el-form-item label="${labelName}" prop="${columnName}">
-        <el-input v-model${numLabel}="queryParams.${columnName}" placeholder="请输入${labelName}" />
-      </el-form-item>
-$end
-$end
-$end
-      <el-form-item>
-        <el-button icon="search" type="primary" @click="handleQuery">{{ ${t}t('btn.search') }}</el-button>
-        <el-button icon="refresh" @click="resetQuery">{{ ${t}t('btn.reset') }}</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- 工具区域 -->
-    <el-row :gutter="10" class="mb8">
-$if(replaceDto.ShowBtnAdd)
-      <el-col :span="1.5">
-        <el-button type="primary" v-hasPermi="['${replaceDto.PermissionPrefix}:add']" plain icon="plus" @click="handleAdd">
-          {{ ${t}t('btn.add') }}
-        </el-button>
-      </el-col>
-$end
-       <el-col :span="1.5">
-        <el-button type="info" plain icon="sort" @click="toggleExpandAll">展开/折叠</el-button>
-      </el-col>
-$if(replaceDto.ShowBtnDelete)
-      <el-col :span="1.5">
-        <el-button type="danger" :disabled="multiple" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" plain icon="delete" @click="handleDelete">
-          {{ ${t}t('btn.delete') }}
-        </el-button>
-      </el-col>
-$end
-$if(replaceDto.ShowBtnExport)
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="download" @click="handleExport" v-hasPermi="['${replaceDto.PermissionPrefix}:export']">
-          {{ ${t}t('btn.export') }}
-        </el-button>
-      </el-col>
-$end
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 数据区域 -->
-    <el-table
-      v-if="refreshTable"
-      :data="dataList"
-      v-loading="loading"
-      ref="tableRef"
-      border
-      highlight-current-row
-      @selection-change="handleSelectionChange"
-      :default-expand-all="isExpandAll"
-      row-key="${tool.FirstLowerCase(genTable.Options.TreeCode)}"
-      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-    >
-      <el-table-column type="selection" width="50" align="center"/>
-$foreach(column in genTable.Columns)
-$set(labelName = "")
-$set(checkboxHtml = "")
-$set(showToolTipHtml = "")
-$set(columnName = column.CsharpFieldFl)
-$if(column.CsharpType == "string" || column.HtmlType == "datetime")
-$set(showToolTipHtml = " :show-overflow-tooltip=\"true\"")
-$end
-$if(column.ColumnComment != "")
-$set(labelName = column.ColumnComment)
-$else
-$set(labelName = column.CsharpFieldFl)
-$end
-$if(column.IsList == true)
-$if(column.HtmlType == "customInput" && column.IsPk == false)
-      <el-table-column prop="${columnName}" label="${labelName}" width="90" sortable align="center">
-        <template #default="scope">
-          <span v-show="editIndex != scope.$${index}index" @click="editCurrRow(scope.$${index}index)">{{scope.row.${columnName}}}</span>
-          <el-input :id="scope.$${index}index" v-show="(editIndex == scope.$${index}index)" v-model="scope.row.${columnName}" @blur="handleChangeSort(scope.row)"></el-input>
-        </template>
-      </el-table-column>
-$elseif(column.HtmlType == "imageUpload")
-      <el-table-column prop="${columnName}" label="${labelName}" align="center">
-        <template #default="scope">
-          <el-image preview-teleported :hide-on-click-modal="true" lazy class="table-td-thumb" fit="contain" :src="scope.row.${columnName}" :preview-src-list="[scope.row.${columnName}]">
-            <div><el-icon :size="15"><document /></el-icon></div>
-          </el-image>
-        </template>
-      </el-table-column>
-$elseif(column.HtmlType == "checkbox" || column.HtmlType == "select" || column.HtmlType == "radio")
-      <el-table-column prop="${columnName}" label="${labelName}" align="center">
-        <template #default="scope">
-$if(column.HtmlType == "checkbox")
-          <dict-tag :options="$if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :value="scope.row.${columnName} ? scope.row.${columnName}.split(',') : []" />
-$else
-          <dict-tag :options="$if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :value="scope.row.${columnName}" />
-$end
-        </template>
-      </el-table-column>
-$else
-      <el-table-column prop="${columnName}" label="${labelName}" align="center"${showToolTipHtml} />
-$end
-$end
-$end
-
-      <el-table-column label="操作" align="center" width="140">
-        <template #default="scope">
-$if(replaceDto.ShowBtnEdit)
-          <el-button v-hasPermi="['${replaceDto.PermissionPrefix}:edit']" type="success" icon="edit" title="编辑" 
-            @click="handleUpdate(scope.row)"></el-button>      
-$end
-$if(replaceDto.ShowBtnDelete)
-          <el-button v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" type="danger" icon="delete" title="删除" 
-            @click="handleDelete(scope.row)"></el-button>
-$end
-        </template>      
-      </el-table-column>
-    </el-table>
-
-    <!-- 添加或修改${genTable.functionName}对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" v-model="open" >
-      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
-        <el-row :gutter="20">
-$foreach(column in genTable.Columns)
-$set(labelName = "")
-$set(labelDisabled = "")
-$set(columnName = column.CsharpFieldFl)
-$set(value = "item.dictValue")
-$if(column.ColumnComment != "")
-$set(labelName = column.ColumnComment)
-$else
-$set(labelName = column.CsharpFieldFl)
-$end
-$if(column.IsPk == true)
-$set(labelDisabled = ":disabled=true")
-$end
-$if(column.CsharpType == "int" || column.CsharpType == "long")
-    $set(value = "parseInt(item.dictValue)")
-$end
-
-$if(column.IsInsert == false && column.IsEdit == false)
-          <el-col :lg="12" v-if="opertype == 2">
-            <el-form-item label="${labelName}">{{form.${columnName}}}</el-form-item>
-          </el-col>
-$elseif(tool.CheckTree(genTable ,column.CsharpField))
-          <el-col :lg="24">
-            <el-form-item label="父级id" prop="${columnName}">
-              <el-cascader
-                class="w100"
-                :options="dataList"
-                :props="{ checkStrictly: true, value: '${treeCode}', label: '${treeName}', emitPath: false }"
-                placeholder="请选择上级菜单"
-                clearable
-                v-model="form.${columnName}"
-              >
-                <template #default="{ node, data }">
-                  <span>{{ data.${treeName} }}</span>
-                  <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-                </template>
-              </el-cascader>
-            </el-form-item>
-          </el-col>
-$elseif(column.IsPK || column.IsIncrement)
-          <el-col :lg="12">
-            <el-form-item label="${labelName}" prop="${columnName}">
-$if(column.IsIncrement == false)
-              <el-input-number v-model.number="form.${columnName}" controls-position="right" placeholder="请输入${labelName}" :disabled="title=='修改数据'"/>
-$else
-              <span v-html="form.${columnName}"/>
-$end
-            </el-form-item>
-          </el-col>
-$else
-$if(column.HtmlType == "inputNumber")
-          <el-col :lg="12">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input-number v-model.number="form.${columnName}" controls-position="right" placeholder="请输入${labelName}" ${labelDisabled}/>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "datetime")
-          <el-col :lg="12">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-date-picker v-model="form.${columnName}" type="datetime" placeholder="选择日期时间"></el-date-picker>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "imageUpload")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <UploadImage v-model="form.${columnName}" :data="{ uploadType: 1 }" />
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "fileUpload")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <UploadFile v-model="form.${columnName}" :data="{ uploadType: 1 }" />
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "radio")
-          <el-col :lg="12">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-radio-group v-model="form.${columnName}">
-                <el-radio v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="${value}">{{item.dictLabel}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "textarea")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input type="textarea" v-model="form.${columnName}" placeholder="请输入${labelName}"/>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "editor")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <editor v-model="form.${columnName}" :min-height="200" />
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "select")
-          <el-col :lg="12">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-select v-model="form.${columnName}" placeholder="请选择${labelName}">
-                <el-option v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictLabel" :value="${value}"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "checkbox")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-checkbox-group v-model="form.${columnName}Checked">
-                <el-checkbox v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictValue">{{item.dictLabel}}</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-$else
-          <el-col :lg="12">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input v-model="form.${columnName}" placeholder="请输入${labelName}" ${labelDisabled}/>
-            </el-form-item>
-          </el-col>
-$end
-$end
-$end
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button text @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
-          <el-button type="primary" @click="submitForm">{{ ${t}t('btn.submit') }}</el-button>
-        </div>
-      </template>
-    </el-dialog>
-
-  </div>
-</template>
-<script setup name="${genTable.BusinessName.ToLower()}">
-import { treelist${genTable.BusinessName}, list${genTable.BusinessName}, add${genTable.BusinessName}, del${genTable.BusinessName}, update${genTable.BusinessName}, get${genTable.BusinessName},
-$if(replaceDto.ShowBtnExport) export${genTable.BusinessName}, $end $if(showCustomInput) changeSort $end } from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
-
-const { proxy } = getCurrentInstance()
-// 是否展开，默认全部折叠
-const isExpandAll = ref(false)
-const refreshTable = ref(true)
-//展开/折叠操作
-function toggleExpandAll() {
-  refreshTable.value = false
-  isExpandAll.value = !isExpandAll.value
-  nextTick(() => {
-    refreshTable.value = true
-  })
-}
-
-// 选中${replaceDto.FistLowerPk}数组数组
-const ids = ref([])
-// 非单选禁用
-const single = ref(true)
-// 非多个禁用
-const multiple = ref(true)
-// 遮罩层
-const loading = ref(false)
-// 显示搜索条件
-const showSearch = ref(true)
-// 查询参数
-const queryParams = reactive({
-  pageNum: 1,
-  pageSize: 10,
-  sort: undefined,
-  sortType: undefined,
-$foreach(item in genTable.Columns)
-$if(item.IsQuery == true)
-  ${item.CsharpFieldFl}: undefined,
-$end
-$end
-})
-// 弹出层标题
-const title = ref("")
-// 操作类型 1、add 2、edit
-const opertype = ref(0)
-// 是否显示弹出层
-const open = ref(false)
-// 表单参数
-const state = reactive({
-  form: {},
-  rules: {
-    $foreach(column in genTable.Columns)
-$if(column.IsRequired && column.IsIncrement == false)
-    ${column.CsharpFieldFl}: [
-        { required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end
-$if(column.CsharpType == "int" || column.CsharpType == "long"), type: "number"$end }
-    ],
-$end
-$end
-  }
-})
-
-const { form, rules } = toRefs(state)
-// 总记录数
-const total = ref(0)
-const dataList = ref([])
-const queryRef = ref()
-const formRef = ref()
-$foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox"))
-// ${item.ColumnComment}选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
-const $if(item.DictType != "") ${item.DictType} $else ${item.CsharpFieldFl}Options$end = ref([])
-$elseif(item.HtmlType == "datetime" && item.IsQuery == true)
-// ${item.ColumnComment}时间范围
-const dateRange${item.CsharpField} = ref([])
-
-$elseif(item.HtmlType == "customInput")
-// ******************自定义编辑 start **********************
-const editIndex = ref(-1)
-// 显示编辑排序
-function editCurrRow(rowId) {
-  editIndex.value = rowId
-
-  setTimeout(() => {
-    document.getElementById(rowId).focus()
-  }, 100)
-}
-// 保存排序
-function handleChangeSort(info) {
-  editIndex.value = -1
-  proxy
-    .${confirm}confirm('是否保存数据?')
-    .then(function () {
-      return changeSort({ value: info.${item.CsharpFieldFl}, id: info.${replaceDto.FistLowerPk} })
-    })
-    .then(() => {
-      handleQuery()
-      proxy.${modal}modal.msgSuccess('修改成功')
-    })
-}
-// ******************自定义编辑 end **********************
-
-$end
-$end
-
-$set(index = 0)
-var dictParams = [
-$foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox") && item.DictType != "")
-  { dictType: "${item.DictType}" },
-$set(index = index + 1)
-$end
-$end
-]
-
-$if(index > 0)
-proxy.getDicts(dictParams).then((response) => {
-  response.data.forEach((element) => {
-    proxy[element.dictType] = element.list
-  })
-})
-$end
-
-function getList(){
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "datetime" && item.IsQuery == true)
-  proxy.addDateRange(queryParams, proxy.dateRange${item.CsharpField}, '${item.CsharpField}');
-$end
-$end
-  loading.value = true
-  treelist${genTable.BusinessName}(queryParams).then(res => {
-    if (res.code == 200) {
-      //dataList.value = res.data.result
-      //total.value = res.data.totalNum
-      dataList.value = res.data
-      loading.value = false
-    }
-  })
-}
-
-// 关闭dialog
-function cancel(){
-  open.value = false
-  reset()
-}
-
-// 重置表单
-function reset() {
-  proxy.resetForm("formRef")
-}
-
-// 查询
-function handleQuery() {
-  queryParams.pageNum = 1
-  getList()
-}
-
-// 添加
-function handleAdd() {
-  reset();
-  open.value = true
-  title.value = '添加'
-  opertype.value = 1
-}
-
-// 删除按钮操作
-function handleDelete(row) {
-  const Ids = row.${replaceDto.FistLowerPk} || ids.value
-
-  proxy.${confirm}confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
-  .then(function () {
-      return del${genTable.BusinessName}(Ids)
-  })
-  .then(() => {
-      handleQuery()
-      proxy.${modal}modal.msgSuccess("删除成功")
-  })
-  .catch(() => {})
-}
-
-// 修改按钮操作
-function handleUpdate(row) {
-  reset()
-  const id = row.${replaceDto.FistLowerPk} || ids.value
-  get${genTable.BusinessName}(id).then((res) => {
-    const { code, data } = res
-    if (code == 200) {
-      open.value = true
-      title.value = "修改数据"
-      opertype.value = 2
-
-      form.value = {
-      ...data,
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "checkbox")
-          ${item.CsharpFieldFl}Checked: data.${item.CsharpFieldFl} ? data.${item.CsharpFieldFl}.split(',') : [],
-$end
-$end
-      }
-    }
-  })
-}
-
-// 表单提交
-function submitForm() {
-  proxy.${refs}refs["formRef"].validate((valid) => {
-    if (valid) {
-      if (form.value.${replaceDto.FistLowerPk} != undefined && opertype.value === 2) {
-        update${genTable.BusinessName}(form.value).then((res) => {
-          proxy.${modal}modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-        .catch(() => {})
-      } else {
-        add${genTable.BusinessName}(form.value).then((res) => {
-            proxy.${modal}modal.msgSuccess("新增成功")
-            open.value = false
-            getList()
-          })
-          .catch((err) => {
-            //TODO 错误逻辑
-          })
-      }
-    }
-  })
-}
-
-// 重置查询操作
-function resetQuery(){
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "datetime" && item.IsQuery == true)
-  // ${item.ColumnComment}时间范围
-  dateRange${item.CsharpField}.value = []
-$end
-$end
-  proxy.resetForm("queryRef")
-  handleQuery()
-}
-$if(replaceDto.ShowBtnExport)
-// 导出按钮操作
-function handleExport() {
-  proxy
-    .${confirm}confirm("是否确认导出所有${genTable.functionName}数据项?", "警告", {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-      type: "warning",
-    })
-    .then(function () {
-      return export${genTable.BusinessName}(queryParams)
-    })
-    .then((response) => {
-      proxy.download(response.data.path)
-    })
-}
-$end
-
-// 多选框选中数据
-function handleSelectionChange(selection) {
-  ids.value = selection.map((item) => item.${replaceDto.FistLowerPk});
-  single.value = selection.length != 1
-  multiple.value = !selection.length;
-}
-
-// 自定义排序
-function sortChange(column) {
-  if (column.prop == null || column.order == null) {
-    queryParams.sort = undefined
-    queryParams.sortType = undefined
-  } else {
-    queryParams.sort = column.prop
-    queryParams.sortType = column.order
-  }
-
-  handleQuery()
-}
-
-handleQuery()
-</script>
\ No newline at end of file
diff --git a/ARW.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ARW.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
deleted file mode 100644
index a379219..0000000
--- a/ARW.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ /dev/null
@@ -1,561 +0,0 @@
-<!--
- * @Descripttion: (${genTable.functionName}/${genTable.tableName})
- * @version: (1.0)
- * @Author: (${replaceDto.Author})
- * @Date: (${replaceDto.AddTime})
- * @LastEditors: (${replaceDto.Author})
- * @LastEditTime: (${replaceDto.AddTime})
--->
-<template>
-  <div>
-    <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
-$foreach(column in genTable.Columns)
-$set(labelName = "")
-$set(columnName = "")
-$set(numLabel = "")
-$if(column.IsQuery == true)
-$set(columnName = column.CsharpFieldFl)
-$if(column.ColumnComment != "")
-$set(labelName = column.ColumnComment)
-$else
-$set(labelName = column.CsharpFieldFl)
-$end
-$if(column.CsharpType == "int" || column.CsharpType == "long")
-$set(numLabel = ".number")
-$end
-$if(column.HtmlType == "datetime")
-      <el-form-item label="$labelName">
-        <el-date-picker 
-          v-model="dateRange${column.CsharpField}" 
-          style="width: 240px" 
-          type="daterange" 
-          range-separator="-"
-          start-placeholder="开始日期" 
-          end-placeholder="结束日期" 
-          placeholder="请选择$labelName"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          :shortcuts="dateOptions">
-        </el-date-picker>
-      </el-form-item>
-$elseif(column.HtmlType == "select" || column.HtmlType == "radio")
-      <el-form-item label="${labelName}" prop="${columnName}">
-        <el-select v-model="queryParams.${columnName}" placeholder="请选择${labelName}">
-          <el-option v-for="item in $if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
-        </el-select>
-      </el-form-item>
-$elseif(column.HtmlType == "radio")
-      <el-form-item label="${labelName}" prop="${columnName}">
-        <el-radio-group v-model="queryParams.${columnName}">
-          <el-radio v-for="item in $if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictValue">{{item.dictLabel}}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-$else
-      <el-form-item label="${labelName}" prop="${columnName}">
-        <el-input v-model${numLabel}="queryParams.${columnName}" placeholder="请输入${labelName}" />
-      </el-form-item>
-$end
-$end
-$end
-      <el-form-item>
-        <el-button icon="search" type="primary" @click="handleQuery">{{ ${t}t('btn.search') }}</el-button>
-        <el-button icon="refresh" @click="resetQuery">{{ ${t}t('btn.reset') }}</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- 工具区域 -->
-    <el-row :gutter="10" class="mb8">
-$if(replaceDto.ShowBtnAdd)
-      <el-col :span="1.5">
-        <el-button type="primary" v-hasPermi="['${replaceDto.PermissionPrefix}:add']" plain icon="plus" @click="handleAdd">
-          {{ ${t}t('btn.add') }}
-        </el-button>
-      </el-col>
-$end
-$if(replaceDto.ShowBtnEdit)
-      <el-col :span="1.5">
-        <el-button type="success" :disabled="single" v-hasPermi="['${replaceDto.PermissionPrefix}:edit']" plain icon="edit" @click="handleUpdate">
-          {{ ${t}t('btn.edit') }}
-        </el-button>
-      </el-col>
-$end
-$if(replaceDto.ShowBtnDelete)
-      <el-col :span="1.5">
-        <el-button type="danger" :disabled="multiple" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" plain icon="delete" @click="handleDelete">
-          {{ ${t}t('btn.delete') }}
-        </el-button>
-      </el-col>
-$end
-$if(replaceDto.ShowBtnExport)
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="download" @click="handleExport" v-hasPermi="['${replaceDto.PermissionPrefix}:export']">
-          {{ ${t}t('btn.export') }}
-        </el-button>
-      </el-col>
-$end
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 数据区域 -->
-    <el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="50" align="center"/>
-
-$foreach(column in genTable.Columns)
-$set(labelName = "")
-$set(checkboxHtml = "")
-$set(showToolTipHtml = "")
-$set(columnName = column.CsharpFieldFl)
-$if(column.CsharpType == "string" || column.HtmlType == "datetime")
-$set(showToolTipHtml = " :show-overflow-tooltip=\"true\"")
-$end
-$if(column.ColumnComment != "")
-$set(labelName = column.ColumnComment)
-$else
-$set(labelName = column.CsharpFieldFl)
-$end
-$if(column.IsList == true)
-$if(column.HtmlType == "customInput" && column.IsPk == false)
-      <el-table-column prop="${columnName}" label="${labelName}" width="90" sortable align="center">
-        <template #default="scope">
-          <span v-show="editIndex != scope.$${index}index" @click="editCurrRow(scope.$${index}index)">{{scope.row.${columnName}}}</span>
-          <el-input
-            :ref="setColumnsRef"
-            v-show="(editIndex == scope.$${index}index)" 
-            v-model="scope.row.${columnName}" 
-            @blur="handleChangeSort(scope.row)"></el-input>
-        </template>
-      </el-table-column>
-$elseif(column.HtmlType == "imageUpload")
-      <el-table-column prop="${columnName}" label="${labelName}" align="center">
-        <template #default="scope">
-          <el-image preview-teleported :hide-on-click-modal="true" lazy class="table-td-thumb" fit="contain" :src="scope.row.${columnName}" :preview-src-list="[scope.row.${columnName}]">
-            <div><el-icon :size="15"><document /></el-icon></div>
-          </el-image>
-        </template>
-      </el-table-column>
-$elseif(column.HtmlType == "checkbox" || column.HtmlType == "select" || column.HtmlType == "radio")
-      <el-table-column prop="${columnName}" label="${labelName}" align="center"${column.sortStr}>
-        <template #default="scope">
-$if(column.HtmlType == "checkbox")
-          <dict-tag :options="$if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :value="scope.row.${columnName} ? scope.row.${columnName}.split(',') : []" />
-$else
-          <dict-tag :options="$if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :value="scope.row.${columnName}" />
-$end
-        </template>
-      </el-table-column>
-$else
-      <el-table-column prop="${columnName}" label="${labelName}" align="center"${showToolTipHtml}${column.sortStr} />
-$end
-$end
-$end
-      <el-table-column label="操作" align="center" width="160">
-        <template #default="scope">
-$if(replaceDto.ShowBtnView)
-          <el-button type="primary" icon="view" @click="handlePreview(scope.row)"></el-button>
-$end
-$if(replaceDto.ShowBtnEdit)
-          <el-button v-hasPermi="['${replaceDto.PermissionPrefix}:edit']" type="success" icon="edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
-$end
-$if(replaceDto.ShowBtnDelete)
-          <el-button v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" type="danger" icon="delete" title="删除" @click="handleDelete(scope.row)"></el-button>
-$end
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination class="mt10" background :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-
-    <!-- 添加或修改${genTable.functionName}对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" v-model="open" >
-      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
-        <el-row :gutter="20">
-$foreach(column in genTable.Columns)
-$set(labelName = "")
-$set(columnName = column.CsharpFieldFl)
-$set(value = "item.dictValue")
-$if(column.ColumnComment != "")
-$set(labelName = column.ColumnComment)
-$else
-$set(labelName = column.CsharpFieldFl)
-$end
-$if(column.CsharpType == "int" || column.CsharpType == "long")
-    $set(value = "parseInt(item.dictValue)")
-$end
-
-$if(column.IsPK || column.IsIncrement)
-          <el-col :lg="${options.ColNum}">
-            <el-form-item label="${labelName}" prop="${columnName}">
-$if(column.IsIncrement == false)
-              <el-input-number v-model.number="form.${columnName}" controls-position="right" placeholder="请输入${labelName}" :disabled="title=='修改数据'"/>
-$else
-              <span v-html="form.${columnName}"/>
-$end
-            </el-form-item>
-          </el-col>
-$else
-$if(column.HtmlType == "inputNumber" || column.HtmlType == "customInput")
-          <el-col :lg="${options.ColNum}">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input-number v-model.number="form.${columnName}" controls-position="right" placeholder="请输入${labelName}" ${column.DisabledStr}/>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "datetime")
-          <el-col :lg="${options.ColNum}">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-date-picker v-model="form.${columnName}" type="datetime" :teleported="false" placeholder="选择日期时间"${column.DisabledStr}></el-date-picker>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "imageUpload")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <UploadImage v-model="form.${columnName}" :data="{ uploadType: 1 }" />
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "fileUpload")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <UploadFile v-model="form.${columnName}" :data="{ uploadType: 1 }" />
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "radio")
-          <el-col :lg="${options.ColNum}">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-radio-group v-model="form.${columnName}"${column.DisabledStr}>
-                <el-radio v-for="item in $if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="${value}">{{item.dictLabel}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "textarea")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input type="textarea" v-model="form.${columnName}" placeholder="请输入${labelName}"${column.DisabledStr}/>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "editor")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <editor v-model="form.${columnName}" :min-height="200" />
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "select")
-          <el-col :lg="${options.ColNum}">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-select v-model="form.${columnName}" placeholder="请选择${labelName}"${column.DisabledStr}>
-                <el-option v-for="item in $if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictLabel" :value="${value}"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-$elseif(column.HtmlType == "checkbox")
-          <el-col :lg="24">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-checkbox-group v-model="form.${columnName}Checked"${column.DisabledStr}>
-                <el-checkbox v-for="item in $if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictValue">{{item.dictLabel}}</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-$else
-          <el-col :lg="${options.ColNum}">
-            <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input v-model="form.${columnName}" placeholder="请输入${labelName}" ${column.DisabledStr}/>
-            </el-form-item>
-          </el-col>
-$end
-$end
-$end
-        </el-row>
-      </el-form>
-      <template #footer v-if="opertype != 3">
-        <el-button text @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
-        <el-button type="primary" @click="submitForm">{{ ${t}t('btn.submit') }}</el-button>
-      </template>
-    </el-dialog>
-
-  </div>
-</template>
-
-
-<script setup name="${genTable.BusinessName.ToLower()}">
-import { list${genTable.BusinessName}, add${genTable.BusinessName}, del${genTable.BusinessName}, update${genTable.BusinessName}, get${genTable.BusinessName},$if(replaceDto.ShowBtnExport) export${genTable.BusinessName}, $end $if(showCustomInput) changeSort $end } from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
-
-const { proxy } = getCurrentInstance()
-// 选中${replaceDto.FistLowerPk}数组数组
-const ids = ref([])
-// 非单选禁用
-const single = ref(true)
-// 非多个禁用
-const multiple = ref(true)
-const loading = ref(false)
-const showSearch = ref(true)
-const queryParams = reactive({
-  pageNum: 1,
-  pageSize: 10,
-  sort: undefined,
-  sortType: undefined,
-$foreach(item in genTable.Columns)
-$if(item.IsQuery == true)
-  ${item.CsharpFieldFl}: undefined,
-$end
-$end
-})
-
-const title = ref("")
-// 操作类型 1、add 2、edit 3、view
-const opertype = ref(0)
-const open = ref(false)
-const state = reactive({
-  form: {},
-  rules: {
-$foreach(column in genTable.Columns)
-$if(column.IsRequired && column.IsIncrement == false)
-    ${column.CsharpFieldFl}: [{ required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end
-$if(column.CsharpType == "int" || column.CsharpType == "long"), type: "number"$end }],
-$end
-$end
-  },
-  options: {
-$foreach(column in genTable.Columns)
-$if((column.HtmlType == "radio" || column.HtmlType == "select" || column.HtmlType == "checkbox"))
-    // $if(column.ColumnComment != "") ${column.ColumnComment} $else ${column.CsharpFieldFl}$end选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
-    $if(column.DictType != "")${column.DictType}$else${column.CsharpFieldFl}Options$end: [],
-$end
-$end
-  }
-})
-
-const { form, rules, options } = toRefs(state)
-const total = ref(0)
-const dataList = ref([])
-const queryRef = ref()
-const formRef = ref()
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "datetime" && item.IsQuery == true)
-// ${item.ColumnComment}时间范围
-const dateRange${item.CsharpField} = ref([])
-
-$elseif(item.HtmlType == "customInput")
-// ******************自定义编辑 start **********************
-const editIndex = ref(-1)
-const columnRefs = ref([])
-const setColumnsRef = (el) => {
-  if (el) {
-    columnRefs.value.push(el)
-  }
-}
-// 显示编辑排序
-function editCurrRow(index) {
-  editIndex.value = index
-
-  setTimeout(() => {
-    columnRefs.value[index].focus()
-  }, 100)
-}
-// 保存排序
-function handleChangeSort(info) {
-  editIndex.value = -1
-  proxy
-    .${confirm}confirm('是否保存数据?')
-    .then(function () {
-      return changeSort({ value: info.${item.CsharpFieldFl}, id: info.${replaceDto.FistLowerPk} })
-    })
-    .then(() => {
-      handleQuery()
-      proxy.${modal}modal.msgSuccess('修改成功')
-    })
-}
-// ******************自定义编辑 end **********************
-
-$end
-$end
-
-$set(index = 0)
-var dictParams = [
-$foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox") && item.DictType != "")
-  { dictType: "${item.DictType}" },
-$set(index = index + 1)
-$end
-$end
-]
-
-$if(index > 0)
-proxy.getDicts(dictParams).then((response) => {
-  response.data.forEach((element) => {
-    state.options[element.dictType] = element.list
-  })
-})
-$end
-
-function getList(){
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "datetime" && item.IsQuery == true)
-  proxy.addDateRange(queryParams, proxy.dateRange${item.CsharpField}, '${item.CsharpField}');
-$end
-$end
-  loading.value = true
-  list${genTable.BusinessName}(queryParams).then(res => {
-    if (res.code == 200) {
-      dataList.value = res.data.result
-      total.value = res.data.totalNum
-      loading.value = false
-    }
-  })
-}
-
-// 关闭dialog
-function cancel(){
-  open.value = false
-  reset()
-}
-
-// 重置表单
-function reset() {
-  form.value = {
-$foreach(item in genTable.Columns)
-$if((item.IsEdit || item.IsInsert))
-    $item.CsharpFieldFl: undefined,
-$end
-$if((item.HtmlType == "checkbox"))
-    ${item.CsharpFieldFl}Checked: [],
-$end
-$end
-  };
-  proxy.resetForm("formRef")
-}
-
-// 查询
-function handleQuery() {
-  queryParams.pageNum = 1
-  getList()
-}
-
-// 添加
-function handleAdd() {
-  reset();
-  open.value = true
-  title.value = '添加'
-  opertype.value = 1
-}
-
-// 删除按钮操作
-function handleDelete(row) {
-  const Ids = row.${replaceDto.FistLowerPk} || ids.value
-
-  proxy.${confirm}confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
-  .then(function () {
-      return del${genTable.BusinessName}(Ids)
-  })
-  .then(() => {
-      handleQuery()
-      proxy.${modal}modal.msgSuccess("删除成功")
-  })
-  .catch(() => {})
-}
-
-// 修改按钮操作
-function handleUpdate(row) {
-  reset()
-  const id = row.${replaceDto.FistLowerPk} || ids.value
-  get${genTable.BusinessName}(id).then((res) => {
-    const { code, data } = res
-    if (code == 200) {
-      open.value = true
-      title.value = "修改数据"
-      opertype.value = 2
-
-      form.value = {
-      ...data,
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "checkbox")
-          ${item.CsharpFieldFl}Checked: data.${item.CsharpFieldFl} ? data.${item.CsharpFieldFl}.split(',') : [],
-$end
-$end
-      }
-    }
-  })
-}
-
-// 表单提交
-function submitForm() {
-  proxy.${refs}refs["formRef"].validate((valid) => {
-    if (valid) {
-      if (form.value.${replaceDto.FistLowerPk} != undefined && opertype.value === 2) {
-        update${genTable.BusinessName}(form.value).then((res) => {
-          proxy.${modal}modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-        .catch(() => {})
-      } else {
-        add${genTable.BusinessName}(form.value).then((res) => {
-            proxy.${modal}modal.msgSuccess("新增成功")
-            open.value = false
-            getList()
-          })
-          .catch((err) => {
-            //TODO 错误逻辑
-          })
-      }
-    }
-  })
-}
-
-// 重置查询操作
-function resetQuery(){
-$foreach(item in genTable.Columns)
-$if(item.HtmlType == "datetime" && item.IsQuery == true)
-  // ${item.ColumnComment}时间范围
-  dateRange${item.CsharpField}.value = []
-$end
-$end
-  proxy.resetForm("queryRef")
-  handleQuery()
-}
-$if(replaceDto.ShowBtnExport)
-// 导出按钮操作
-function handleExport() {
-  proxy
-    .${confirm}confirm("是否确认导出所有${genTable.functionName}数据项?", "警告", {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-      type: "warning",
-    })
-    .then(function () {
-      return export${genTable.BusinessName}(queryParams)
-    })
-    .then((response) => {
-      proxy.download(response.data.path)
-    })
-}
-$end
-$if(replaceDto.ShowBtnView)
-/**
- * 预览
- * @param {*} row
- */
-function handlePreview(row) {
-  reset()
-  open.value = true
-  title.value = '预览'
-  opertype.value = 3
-  form.value = row
-}
-$end
-// 多选框选中数据
-function handleSelectionChange(selection) {
-  ids.value = selection.map((item) => item.${replaceDto.FistLowerPk});
-  single.value = selection.length != 1
-  multiple.value = !selection.length;
-}
-
-// 自定义排序
-function sortChange(column) {
-  if (column.prop == null || column.order == null) {
-    queryParams.sort = undefined
-    queryParams.sortType = undefined
-  } else {
-    queryParams.sort = column.prop
-    queryParams.sortType = column.order
-  }
-
-  handleQuery()
-}
-
-handleQuery()
-</script>
\ No newline at end of file
diff --git a/ARW.WebApi/wwwroot/Customer/20221205/65F692EEF4BD7E7F.jpg b/ARW.WebApi/wwwroot/Customer/20221205/65F692EEF4BD7E7F.jpg
deleted file mode 100644
index 6fc9ff5..0000000
Binary files a/ARW.WebApi/wwwroot/Customer/20221205/65F692EEF4BD7E7F.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Customer/20221206/26C2880C544720B4.jpg b/ARW.WebApi/wwwroot/Customer/20221206/26C2880C544720B4.jpg
deleted file mode 100644
index 8164cf3..0000000
Binary files a/ARW.WebApi/wwwroot/Customer/20221206/26C2880C544720B4.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Customer/20221206/4EBF8809FE13A3B2.png b/ARW.WebApi/wwwroot/Customer/20221206/4EBF8809FE13A3B2.png
deleted file mode 100644
index afbe7ba..0000000
Binary files a/ARW.WebApi/wwwroot/Customer/20221206/4EBF8809FE13A3B2.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Customer/20221206/6F7FD388B5C48D45.jpg b/ARW.WebApi/wwwroot/Customer/20221206/6F7FD388B5C48D45.jpg
deleted file mode 100644
index 8164cf3..0000000
Binary files a/ARW.WebApi/wwwroot/Customer/20221206/6F7FD388B5C48D45.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Customer/20221206/BF907F248CEACFAA.png b/ARW.WebApi/wwwroot/Customer/20221206/BF907F248CEACFAA.png
deleted file mode 100644
index b3a073d..0000000
Binary files a/ARW.WebApi/wwwroot/Customer/20221206/BF907F248CEACFAA.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Customer/20221206/E22AD557FC2E0A9D.jpg b/ARW.WebApi/wwwroot/Customer/20221206/E22AD557FC2E0A9D.jpg
deleted file mode 100644
index 65316c6..0000000
Binary files a/ARW.WebApi/wwwroot/Customer/20221206/E22AD557FC2E0A9D.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/FatPig/20230312/379BC13C3CD2EB81.jpg b/ARW.WebApi/wwwroot/FatPig/20230312/379BC13C3CD2EB81.jpg
deleted file mode 100644
index 083e2ed..0000000
Binary files a/ARW.WebApi/wwwroot/FatPig/20230312/379BC13C3CD2EB81.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/FatPig/20230312/952E03C0AB6DE27E.png b/ARW.WebApi/wwwroot/FatPig/20230312/952E03C0AB6DE27E.png
deleted file mode 100644
index 200eace..0000000
Binary files a/ARW.WebApi/wwwroot/FatPig/20230312/952E03C0AB6DE27E.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/FatPig/20230312/B5FF4B44D2065729.jpg b/ARW.WebApi/wwwroot/FatPig/20230312/B5FF4B44D2065729.jpg
deleted file mode 100644
index 29cf3af..0000000
Binary files a/ARW.WebApi/wwwroot/FatPig/20230312/B5FF4B44D2065729.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/FatPig/20230312/D467F076615D35E2.jpg b/ARW.WebApi/wwwroot/FatPig/20230312/D467F076615D35E2.jpg
deleted file mode 100644
index 4e05ae6..0000000
Binary files a/ARW.WebApi/wwwroot/FatPig/20230312/D467F076615D35E2.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/FatPig/20230312/FF87CCE218F412FF.jpg b/ARW.WebApi/wwwroot/FatPig/20230312/FF87CCE218F412FF.jpg
deleted file mode 100644
index 083e2ed..0000000
Binary files a/ARW.WebApi/wwwroot/FatPig/20230312/FF87CCE218F412FF.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/FatPig/20230313/66D3729A165A0828.jpg b/ARW.WebApi/wwwroot/FatPig/20230313/66D3729A165A0828.jpg
deleted file mode 100644
index 5396982..0000000
Binary files a/ARW.WebApi/wwwroot/FatPig/20230313/66D3729A165A0828.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/FatPig/20230313/C63B4A4378625C9B.jpg b/ARW.WebApi/wwwroot/FatPig/20230313/C63B4A4378625C9B.jpg
deleted file mode 100644
index cad38fb..0000000
Binary files a/ARW.WebApi/wwwroot/FatPig/20230313/C63B4A4378625C9B.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230520/1256BD283BB3F427.jpg b/ARW.WebApi/wwwroot/Open/20230520/1256BD283BB3F427.jpg
deleted file mode 100644
index 4bb0e9b..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230520/1256BD283BB3F427.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230520/408AC668A70CFC0B.png b/ARW.WebApi/wwwroot/Open/20230520/408AC668A70CFC0B.png
deleted file mode 100644
index 2cee6f6..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230520/408AC668A70CFC0B.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230521/19BABB94FAC2CE98.jpg b/ARW.WebApi/wwwroot/Open/20230521/19BABB94FAC2CE98.jpg
deleted file mode 100644
index 4bb0e9b..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230521/19BABB94FAC2CE98.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230521/3B2680151B011BFE.jpg b/ARW.WebApi/wwwroot/Open/20230521/3B2680151B011BFE.jpg
deleted file mode 100644
index 40f942d..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230521/3B2680151B011BFE.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230521/407E393089C55540.jpg b/ARW.WebApi/wwwroot/Open/20230521/407E393089C55540.jpg
deleted file mode 100644
index 4bb0e9b..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230521/407E393089C55540.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230522/0C5E63201C510AF8.png b/ARW.WebApi/wwwroot/Open/20230522/0C5E63201C510AF8.png
deleted file mode 100644
index 4843185..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230522/0C5E63201C510AF8.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230522/51B3F7D5C0E01DC4.png b/ARW.WebApi/wwwroot/Open/20230522/51B3F7D5C0E01DC4.png
deleted file mode 100644
index 90292a9..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230522/51B3F7D5C0E01DC4.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230522/9671AD0F48BB910D.png b/ARW.WebApi/wwwroot/Open/20230522/9671AD0F48BB910D.png
deleted file mode 100644
index 7079f32..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230522/9671AD0F48BB910D.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230522/AC0F189241B8C2EF.png b/ARW.WebApi/wwwroot/Open/20230522/AC0F189241B8C2EF.png
deleted file mode 100644
index 7079f32..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230522/AC0F189241B8C2EF.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230522/B1F5AEBE424925F0.jpg b/ARW.WebApi/wwwroot/Open/20230522/B1F5AEBE424925F0.jpg
deleted file mode 100644
index 4bb0e9b..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230522/B1F5AEBE424925F0.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230522/B55627CBF8C19DB4.png b/ARW.WebApi/wwwroot/Open/20230522/B55627CBF8C19DB4.png
deleted file mode 100644
index 8b28546..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230522/B55627CBF8C19DB4.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230522/B7D166BF518FAF8F.jpg b/ARW.WebApi/wwwroot/Open/20230522/B7D166BF518FAF8F.jpg
deleted file mode 100644
index ca95370..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230522/B7D166BF518FAF8F.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230523/76BE4D0F9D3D8ED9.png b/ARW.WebApi/wwwroot/Open/20230523/76BE4D0F9D3D8ED9.png
deleted file mode 100644
index 2cee6f6..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230523/76BE4D0F9D3D8ED9.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230524/118A19CEB6B112E9.png b/ARW.WebApi/wwwroot/Open/20230524/118A19CEB6B112E9.png
deleted file mode 100644
index 8b28546..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230524/118A19CEB6B112E9.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230524/1BC725E98C87B8A1.jpg b/ARW.WebApi/wwwroot/Open/20230524/1BC725E98C87B8A1.jpg
deleted file mode 100644
index 39dfc13..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230524/1BC725E98C87B8A1.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230524/4F32D8D44BAF74C9.jpg b/ARW.WebApi/wwwroot/Open/20230524/4F32D8D44BAF74C9.jpg
deleted file mode 100644
index 39dfc13..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230524/4F32D8D44BAF74C9.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230524/5E71D2AAB24E7092.png b/ARW.WebApi/wwwroot/Open/20230524/5E71D2AAB24E7092.png
deleted file mode 100644
index 6cc6c9d..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230524/5E71D2AAB24E7092.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230524/FFBE5BD961106D03.jpg b/ARW.WebApi/wwwroot/Open/20230524/FFBE5BD961106D03.jpg
deleted file mode 100644
index e8d3855..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230524/FFBE5BD961106D03.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230525/0AF2444311A3E857.png b/ARW.WebApi/wwwroot/Open/20230525/0AF2444311A3E857.png
deleted file mode 100644
index 419a17b..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230525/0AF2444311A3E857.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230525/3B98C672FC9E4155.png b/ARW.WebApi/wwwroot/Open/20230525/3B98C672FC9E4155.png
deleted file mode 100644
index 419a17b..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230525/3B98C672FC9E4155.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230525/67CCFDA48B6A659F.png b/ARW.WebApi/wwwroot/Open/20230525/67CCFDA48B6A659F.png
deleted file mode 100644
index 1f736c1..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230525/67CCFDA48B6A659F.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230526/DCD27EDED113A27D.png b/ARW.WebApi/wwwroot/Open/20230526/DCD27EDED113A27D.png
deleted file mode 100644
index 419a17b..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230526/DCD27EDED113A27D.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230526/DE04786797F798D0.png b/ARW.WebApi/wwwroot/Open/20230526/DE04786797F798D0.png
deleted file mode 100644
index 419a17b..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230526/DE04786797F798D0.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230528/089752A923D00ED0.jpg b/ARW.WebApi/wwwroot/Open/20230528/089752A923D00ED0.jpg
deleted file mode 100644
index 13705ff..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230528/089752A923D00ED0.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230528/1ACD3195ABF7CB38.jpg b/ARW.WebApi/wwwroot/Open/20230528/1ACD3195ABF7CB38.jpg
deleted file mode 100644
index 39dfc13..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230528/1ACD3195ABF7CB38.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230528/8D8AD0FCCF366AB8.jpg b/ARW.WebApi/wwwroot/Open/20230528/8D8AD0FCCF366AB8.jpg
deleted file mode 100644
index 40f942d..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230528/8D8AD0FCCF366AB8.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Open/20230528/E46A81225256BB4E.png b/ARW.WebApi/wwwroot/Open/20230528/E46A81225256BB4E.png
deleted file mode 100644
index 693cebe..0000000
Binary files a/ARW.WebApi/wwwroot/Open/20230528/E46A81225256BB4E.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221017/9B5EF21374B3762E.jpg b/ARW.WebApi/wwwroot/Product/20221017/9B5EF21374B3762E.jpg
deleted file mode 100644
index 926cb93..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221017/9B5EF21374B3762E.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221017/CFE212EC0D1B033D.jpg b/ARW.WebApi/wwwroot/Product/20221017/CFE212EC0D1B033D.jpg
deleted file mode 100644
index 8164cf3..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221017/CFE212EC0D1B033D.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221017/D2528CA687528F52.jpg b/ARW.WebApi/wwwroot/Product/20221017/D2528CA687528F52.jpg
deleted file mode 100644
index 8164cf3..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221017/D2528CA687528F52.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221017/DCC860C1DB053A57.jpg b/ARW.WebApi/wwwroot/Product/20221017/DCC860C1DB053A57.jpg
deleted file mode 100644
index 8164cf3..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221017/DCC860C1DB053A57.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221018/036051BBE607E17D.jpg b/ARW.WebApi/wwwroot/Product/20221018/036051BBE607E17D.jpg
deleted file mode 100644
index ebd1e8a..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221018/036051BBE607E17D.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221018/1335C8AF690BABB5.jpg b/ARW.WebApi/wwwroot/Product/20221018/1335C8AF690BABB5.jpg
deleted file mode 100644
index 05e1c88..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221018/1335C8AF690BABB5.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221018/25CE98A7A85C6231.jpg b/ARW.WebApi/wwwroot/Product/20221018/25CE98A7A85C6231.jpg
deleted file mode 100644
index 6fc9ff5..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221018/25CE98A7A85C6231.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221018/2E1D6BB06C825E56.jpg b/ARW.WebApi/wwwroot/Product/20221018/2E1D6BB06C825E56.jpg
deleted file mode 100644
index 2783f33..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221018/2E1D6BB06C825E56.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221018/6F34BA210DD23E8E.jpg b/ARW.WebApi/wwwroot/Product/20221018/6F34BA210DD23E8E.jpg
deleted file mode 100644
index 926cb93..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221018/6F34BA210DD23E8E.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221018/7E177EB6FFD790BC.jpg b/ARW.WebApi/wwwroot/Product/20221018/7E177EB6FFD790BC.jpg
deleted file mode 100644
index ebd1e8a..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221018/7E177EB6FFD790BC.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221018/7E6AF34D2329F3AE.jpg b/ARW.WebApi/wwwroot/Product/20221018/7E6AF34D2329F3AE.jpg
deleted file mode 100644
index 6fc9ff5..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221018/7E6AF34D2329F3AE.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221018/83FBB687220EACA4.jpg b/ARW.WebApi/wwwroot/Product/20221018/83FBB687220EACA4.jpg
deleted file mode 100644
index 6fc9ff5..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221018/83FBB687220EACA4.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221018/85EB2F9A5A3CC32F.jpg b/ARW.WebApi/wwwroot/Product/20221018/85EB2F9A5A3CC32F.jpg
deleted file mode 100644
index 9754520..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221018/85EB2F9A5A3CC32F.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221018/99725D506AAFE44E.png b/ARW.WebApi/wwwroot/Product/20221018/99725D506AAFE44E.png
deleted file mode 100644
index b3a073d..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221018/99725D506AAFE44E.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221018/DCC636CE878C6763.jpg b/ARW.WebApi/wwwroot/Product/20221018/DCC636CE878C6763.jpg
deleted file mode 100644
index 8164cf3..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221018/DCC636CE878C6763.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221018/E6C6236C049D2A3D.jpg b/ARW.WebApi/wwwroot/Product/20221018/E6C6236C049D2A3D.jpg
deleted file mode 100644
index 2783f33..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221018/E6C6236C049D2A3D.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221018/E95AA948ACCE11E6.jpg b/ARW.WebApi/wwwroot/Product/20221018/E95AA948ACCE11E6.jpg
deleted file mode 100644
index 926cb93..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221018/E95AA948ACCE11E6.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Product/20221206/8DEE516816FBC2C7.png b/ARW.WebApi/wwwroot/Product/20221206/8DEE516816FBC2C7.png
deleted file mode 100644
index afbe7ba..0000000
Binary files a/ARW.WebApi/wwwroot/Product/20221206/8DEE516816FBC2C7.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Projectes/20230519/108408BFAE045F31.jpg b/ARW.WebApi/wwwroot/Projectes/20230519/108408BFAE045F31.jpg
deleted file mode 100644
index ca95370..0000000
Binary files a/ARW.WebApi/wwwroot/Projectes/20230519/108408BFAE045F31.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Projectes/20230522/BFB3D4DE920F168D.jpg b/ARW.WebApi/wwwroot/Projectes/20230522/BFB3D4DE920F168D.jpg
deleted file mode 100644
index 9409a0b..0000000
Binary files a/ARW.WebApi/wwwroot/Projectes/20230522/BFB3D4DE920F168D.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/TestParts/20230317/411A8CAC77E10F05.png b/ARW.WebApi/wwwroot/TestParts/20230317/411A8CAC77E10F05.png
deleted file mode 100644
index 0090f47..0000000
Binary files a/ARW.WebApi/wwwroot/TestParts/20230317/411A8CAC77E10F05.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/TestParts/20230317/4D646124ADE5DEE1.jpg b/ARW.WebApi/wwwroot/TestParts/20230317/4D646124ADE5DEE1.jpg
deleted file mode 100644
index 8164cf3..0000000
Binary files a/ARW.WebApi/wwwroot/TestParts/20230317/4D646124ADE5DEE1.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/TestParts/20230317/DAAB6B82065631D7.jpg b/ARW.WebApi/wwwroot/TestParts/20230317/DAAB6B82065631D7.jpg
deleted file mode 100644
index 44eda73..0000000
Binary files a/ARW.WebApi/wwwroot/TestParts/20230317/DAAB6B82065631D7.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/TestParts/20230319/D0E64E4293EAF23D.jpg b/ARW.WebApi/wwwroot/TestParts/20230319/D0E64E4293EAF23D.jpg
deleted file mode 100644
index 8164cf3..0000000
Binary files a/ARW.WebApi/wwwroot/TestParts/20230319/D0E64E4293EAF23D.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230316/10EF12AA6595ECE6.png b/ARW.WebApi/wwwroot/Testd/20230316/10EF12AA6595ECE6.png
deleted file mode 100644
index 6cc6c9d..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230316/10EF12AA6595ECE6.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230316/4B98D85856853C87.png b/ARW.WebApi/wwwroot/Testd/20230316/4B98D85856853C87.png
deleted file mode 100644
index 6853262..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230316/4B98D85856853C87.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230316/5FD5DEF20D91AACB.png b/ARW.WebApi/wwwroot/Testd/20230316/5FD5DEF20D91AACB.png
deleted file mode 100644
index 6853262..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230316/5FD5DEF20D91AACB.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230316/7431414626E70017.png b/ARW.WebApi/wwwroot/Testd/20230316/7431414626E70017.png
deleted file mode 100644
index 993e4c1..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230316/7431414626E70017.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230316/7508735A222CEC00.png b/ARW.WebApi/wwwroot/Testd/20230316/7508735A222CEC00.png
deleted file mode 100644
index 92845c7..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230316/7508735A222CEC00.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230316/BD4C9FF7BB37C803.png b/ARW.WebApi/wwwroot/Testd/20230316/BD4C9FF7BB37C803.png
deleted file mode 100644
index 6853262..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230316/BD4C9FF7BB37C803.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230316/E68A1232F07C900F.png b/ARW.WebApi/wwwroot/Testd/20230316/E68A1232F07C900F.png
deleted file mode 100644
index 6cc6c9d..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230316/E68A1232F07C900F.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230317/12BD0313CD721731.jpg b/ARW.WebApi/wwwroot/Testd/20230317/12BD0313CD721731.jpg
deleted file mode 100644
index 774d5df..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230317/12BD0313CD721731.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230317/452CBE55FB24BB98.jpg b/ARW.WebApi/wwwroot/Testd/20230317/452CBE55FB24BB98.jpg
deleted file mode 100644
index ab41595..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230317/452CBE55FB24BB98.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230317/47AD7C5F66CBF796.jpeg b/ARW.WebApi/wwwroot/Testd/20230317/47AD7C5F66CBF796.jpeg
deleted file mode 100644
index 6524a0e..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230317/47AD7C5F66CBF796.jpeg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230317/47E837A00A5F0CBA.jpg b/ARW.WebApi/wwwroot/Testd/20230317/47E837A00A5F0CBA.jpg
deleted file mode 100644
index 6524a0e..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230317/47E837A00A5F0CBA.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230317/645B107D6554D7C0.jpg b/ARW.WebApi/wwwroot/Testd/20230317/645B107D6554D7C0.jpg
deleted file mode 100644
index ab41595..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230317/645B107D6554D7C0.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230317/880AB7044A6E397C.jpg b/ARW.WebApi/wwwroot/Testd/20230317/880AB7044A6E397C.jpg
deleted file mode 100644
index 6524a0e..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230317/880AB7044A6E397C.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230317/9430C2F146C6B335.jpeg b/ARW.WebApi/wwwroot/Testd/20230317/9430C2F146C6B335.jpeg
deleted file mode 100644
index e9a0a00..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230317/9430C2F146C6B335.jpeg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230317/BA0A0257B439915E.png b/ARW.WebApi/wwwroot/Testd/20230317/BA0A0257B439915E.png
deleted file mode 100644
index 92845c7..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230317/BA0A0257B439915E.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230317/BCB56A600AA0DFB9.png b/ARW.WebApi/wwwroot/Testd/20230317/BCB56A600AA0DFB9.png
deleted file mode 100644
index 9e4f5d7..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230317/BCB56A600AA0DFB9.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230317/D888EFC39456BF88.png b/ARW.WebApi/wwwroot/Testd/20230317/D888EFC39456BF88.png
deleted file mode 100644
index ab9edda..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230317/D888EFC39456BF88.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230317/DBFA3C2492F3E0B7.jpg b/ARW.WebApi/wwwroot/Testd/20230317/DBFA3C2492F3E0B7.jpg
deleted file mode 100644
index 0b99a36..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230317/DBFA3C2492F3E0B7.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230317/ECBE290D76C238E7.jpg b/ARW.WebApi/wwwroot/Testd/20230317/ECBE290D76C238E7.jpg
deleted file mode 100644
index 6524a0e..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230317/ECBE290D76C238E7.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/Testd/20230317/F3E09E2691865E09.jpg b/ARW.WebApi/wwwroot/Testd/20230317/F3E09E2691865E09.jpg
deleted file mode 100644
index 994645d..0000000
Binary files a/ARW.WebApi/wwwroot/Testd/20230317/F3E09E2691865E09.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/email/20220723/75FE70F994AA3573.xlsx b/ARW.WebApi/wwwroot/email/20220723/75FE70F994AA3573.xlsx
deleted file mode 100644
index 953c46a..0000000
Binary files a/ARW.WebApi/wwwroot/email/20220723/75FE70F994AA3573.xlsx and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/key/20230202/BE49408B286052C6.jpg b/ARW.WebApi/wwwroot/key/20230202/BE49408B286052C6.jpg
deleted file mode 100644
index cad38fb..0000000
Binary files a/ARW.WebApi/wwwroot/key/20230202/BE49408B286052C6.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/key/20230202/D10B8187A4A841C8.jpg b/ARW.WebApi/wwwroot/key/20230202/D10B8187A4A841C8.jpg
deleted file mode 100644
index 5fc1e1a..0000000
Binary files a/ARW.WebApi/wwwroot/key/20230202/D10B8187A4A841C8.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/student/20221116/31BAA2C13B5F43A5.jpg b/ARW.WebApi/wwwroot/student/20221116/31BAA2C13B5F43A5.jpg
deleted file mode 100644
index 0fb5651..0000000
Binary files a/ARW.WebApi/wwwroot/student/20221116/31BAA2C13B5F43A5.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/student/20221116/D4A55F2C4BEA1B23.jpg b/ARW.WebApi/wwwroot/student/20221116/D4A55F2C4BEA1B23.jpg
deleted file mode 100644
index 2010ac5..0000000
Binary files a/ARW.WebApi/wwwroot/student/20221116/D4A55F2C4BEA1B23.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/student/20230202/D8B1F9A962B71442.jpg b/ARW.WebApi/wwwroot/student/20230202/D8B1F9A962B71442.jpg
deleted file mode 100644
index cad38fb..0000000
Binary files a/ARW.WebApi/wwwroot/student/20230202/D8B1F9A962B71442.jpg and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/student/20230320/34A71A4979D2333D.png b/ARW.WebApi/wwwroot/student/20230320/34A71A4979D2333D.png
deleted file mode 100644
index bc17806..0000000
Binary files a/ARW.WebApi/wwwroot/student/20230320/34A71A4979D2333D.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/student/20230320/6CDEB4F345CE58EF.png b/ARW.WebApi/wwwroot/student/20230320/6CDEB4F345CE58EF.png
deleted file mode 100644
index bc17806..0000000
Binary files a/ARW.WebApi/wwwroot/student/20230320/6CDEB4F345CE58EF.png and /dev/null differ
diff --git a/ARW.WebApi/wwwroot/student/20230320/F1CBF0822D9676EF.png b/ARW.WebApi/wwwroot/student/20230320/F1CBF0822D9676EF.png
deleted file mode 100644
index 0e70bd9..0000000
Binary files a/ARW.WebApi/wwwroot/student/20230320/F1CBF0822D9676EF.png and /dev/null differ