diff --git a/antis-ncc-admin/.env.development b/antis-ncc-admin/.env.development index bd6266d..f2eb5cf 100644 --- a/antis-ncc-admin/.env.development +++ b/antis-ncc-admin/.env.development @@ -1,5 +1,5 @@ # 开发 VUE_CLI_BABEL_TRANSPILE_MODULES = true -VUE_APP_BASE_API = 'http://lvqian.antissoft.com' +VUE_APP_BASE_API = 'http://localhost:2011' VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket' diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs index f1c79d9..7da1058 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs @@ -132,5 +132,10 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx /// 年龄 /// public string ml { get; set; } + + /// + /// 添加时间 + /// + public string createTime { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs index 1bb0768..8b4e5e7 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs @@ -131,5 +131,10 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx /// 年龄 /// public string ml { get; set; } + + /// + /// 添加时间 + /// + public string createTime { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs index 4337b6c..23d62d4 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs @@ -165,6 +165,6 @@ namespace NCC.Extend.Entitys.lq_khxx /// 添加时间 /// [SugarColumn(ColumnName = "F_CreateTime")] - public DateTime CreateTime { get; set; } = DateTime.Now; + public string CreateTime { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs index 0f62233..fea575a 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs @@ -130,6 +130,7 @@ namespace NCC.Extend.LqKhxx yanglsr = it.Yanglsr, yinlsr = it.Yinlsr, ml = it.Ml, + createTime = it.CreateTime, }) .MergeTable() .OrderBy(sidx + " " + input.sort) @@ -241,6 +242,7 @@ namespace NCC.Extend.LqKhxx yanglsr = it.Yanglsr, yinlsr = it.Yinlsr, ml = it.Ml, + createTime = it.CreateTime, }) .MergeTable() .OrderBy(sidx + " " + input.sort) @@ -328,6 +330,7 @@ namespace NCC.Extend.LqKhxx yanglsr = it.Yanglsr, yinlsr = it.Yinlsr, ml = it.Ml, + createTime = it.CreateTime, }) .MergeTable() .OrderBy(sidx + " " + input.sort)