gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
305 Commits 1 Branch 0 Tags 68 MiB
9f7f454bd5
Commit Graph

305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zuohuaijun
9f7f454bd5 😂解决冲突 2024-07-17 17:40:16 +08:00
zuohuaijun
c10ae9d849 😂恢复本地时间格式 2024-07-17 17:37:06 +08:00
zuohuaijun
09f3e285c7 Merge pull request '🌃调整水印获取IP的方法' (#61) from KaneLeung/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/61
 2024-07-17 11:18:46 +08:00
KaneLeung
557ac3536d 👨‍🦱消除树表格报黄 2024-07-17 11:00:52 +08:00
zuohuaijun
deebfa5896 😎1、去掉基类时间多余特性 2、修复创建时间默认逻辑 2024-07-17 10:45:38 +08:00
KaneLeung
f04fbdb90f 🧪修复LDAP列表查询报错 2024-07-17 10:19:14 +08:00
KaneLeung
578237571b 🌃调整水印获取IP的方法 2024-07-17 09:56:16 +08:00
zuohuaijun
33c7f7c3bd 😎修复日志js文件 2024-07-17 01:16:44 +08:00
zuohuaijun
1895fe4c9d Merge pull request '移除代码生成器中按照时间排序导致前端如果传入field:createTime会出现"SqlSugar.SqlSugarException: 在排序依据列表中多次指定了某一列。排序依据列表中的列必须是唯一的。"的错误' (#59) from suncaomei/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/59
 2024-07-17 01:03:55 +08:00
CAOMEI\s
e1957dc7df 移除代码生成器中按照时间排序导致前端如果传入field:createTime会出现"SqlSugar.SqlSugarException: 在排序依据列表中多次指定了某一列。排序依据列表中的列必须是唯一的。"的错误 2024-07-17 01:01:39 +08:00
zuohuaijun
88fc37c75c Merge pull request '需要将表达式中的 Expression.Or 替换为 Expression.OrElse。在表达式树中，Expression.Or 对应于位运算符 OR（|），而 Expression.OrElse 对应于逻辑运算符 OR（||），后者才是 SQL 中使用的正确逻辑运算符。' (#58) from suncaomei/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/58
 2024-07-16 23:10:52 +08:00
CAOMEI\s
dc2117a3d8 需要将表达式中的 Expression.Or 替换为 Expression.OrElse。在表达式树中，Expression.Or 对应于位运算符 OR（|），而 Expression.OrElse 对应于逻辑运算符 OR（||），后者才是 SQL 中使用的正确逻辑运算符。 2024-07-16 23:07:55 +08:00
zuohuaijun
80745e5cb4 Merge pull request '修正字典匹配' (#57) from orzsoft_admin/Admin.NET.Pro:template into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/57
 2024-07-16 20:33:33 +08:00
Master
15fec5d2c8 修正字典匹配 2024-07-16 19:08:22 +08:00
zuohuaijun
cfb09f9f45 😎统一时间为UTC格式：Now => UtcNow 2024-07-16 18:06:39 +08:00
zuohuaijun
731950d699 😎1、优化字典获取 2、调整首页组件 2024-07-16 18:02:51 +08:00
zuohuaijun
b943a7850b 😎升级Furion v4.9.4.6 2024-07-16 17:17:17 +08:00
zuohuaijun
634e24eb09 Merge pull request '修改所有列表页面 加载效果' (#56) from orzsoft_admin/Admin.NET.Pro:template into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/56
 2024-07-16 17:10:19 +08:00
Master
7d756f3c1e 修改所有列表页面 加载效果 2024-07-16 16:07:57 +08:00
zuohuaijun
755f7d4e78 😎修复获取字典错误 2024-07-16 15:59:49 +08:00
zuohuaijun
4f6fc8da4e 😎增加获取机器序列号接口 2024-07-16 13:03:18 +08:00
zuohuaijun
2cc272c001 😎增加首页显示系统名称 2024-07-16 12:35:38 +08:00
zuohuaijun
d43f860d7a Merge pull request '首页日程增加删除按钮' (#54) from orzsoft_admin/Admin.NET.Pro:template into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/54
 2024-07-16 12:34:20 +08:00
Master
d0c6fb5b72 更新日程删除提示 2024-07-16 11:46:14 +08:00
Master
9cd0ce6647 首页日程增加删除按钮 2024-07-16 11:41:34 +08:00
zuohuaijun
772e018126 😎消除编译器警告 2024-07-16 11:09:24 +08:00
zuohuaijun
c635a5d505 😎调整代码生成模板 2024-07-16 10:56:58 +08:00
zuohuaijun
15054976bc 😎首页日程增加农历显示 2024-07-16 10:53:15 +08:00
zuohuaijun
e76ea05a6d Merge pull request '修复信息回显' (#52) from orzsoft_admin/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/52
 2024-07-16 10:49:48 +08:00
zuohuaijun
01cd210fb4 Merge pull request '代码生成模版统一分页查询实体名' (#53) from orzsoft_admin/Admin.NET.Pro:template into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/53
 2024-07-16 10:49:35 +08:00
Master
4c5ad304c2 代码生成模板统一分页查询实体名 2024-07-16 10:13:25 +08:00
IMaster
9d8bc323da 修复信息回显 2024-07-16 09:18:36 +08:00
Master
2a4efa76a4 Merge remote-tracking branch 'upstream/main' into template 2024-07-16 08:23:21 +08:00
zuohuaijun
68a40e67b3 😎调整代码生成模板 2024-07-16 00:45:59 +08:00
zuohuaijun
5f9305ebf7 Merge branch 'main' of http://101.43.53.74:3000/Admin.NET/Admin.NET 2024-07-16 00:41:51 +08:00
zuohuaijun
318c03cac4 😎1、增加首页我的日程组件 2、其他优化 2024-07-16 00:41:41 +08:00
zuohuaijun
fe0dfc0c68 Merge pull request '删除多余的禁用判断' (#50) from orzsoft_admin/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/50
 2024-07-15 19:56:34 +08:00
IMaster
8142f3fb6c 删除多余的禁用判断 2024-07-15 14:47:30 +08:00
Master
f6817a51ae Merge remote-tracking branch 'upstream/main' into template 2024-07-15 14:45:46 +08:00
zuohuaijun
ae7f54c4d6 😎增加文件上传时格式和大小显示 2024-07-15 14:43:07 +08:00
zuohuaijun
acf1ea7d1b 😎1、调整系统配置参数与常量 2、去掉无效的接口（获取水印配置） 2024-07-15 14:16:15 +08:00
zuohuaijun
1569f61bf3 😎增加字典值时更新缓存 2024-07-15 12:49:34 +08:00
zuohuaijun
91c61d9da5 😎1、统一系统标题 2、调整配置为常量 3、优化logo上传 4、优化行政区域入库性能 5、增加权限标记特性 6、调整在线用户 2024-07-15 11:38:17 +08:00
Master
612e82f741 Merge remote-tracking branch 'upstream/main' into template 2024-07-15 10:08:13 +08:00
zuohuaijun
aad1352f15 Merge pull request '更新 Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WxOpenInput.cs' (#48) from 362270511/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/48
 2024-07-15 10:04:05 +08:00
362270511
01024a8088 更新 Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WxOpenInput.cs 
添加验证签名dto
 2024-07-15 10:01:56 +08:00
zuohuaijun
022deacdcd Merge pull request '添加微信小程序消息发送签名验证方法' (#47) from 362270511/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/47
 2024-07-15 02:51:33 +08:00
zuohuaijun
31cc8fd274 😎调整定时任务持久化等相关代码 2024-07-14 16:42:14 +08:00
zuohuaijun
30a935e105 😎修改首页欢迎组件标题 2024-07-14 16:33:14 +08:00
zuohuaijun
a588c38369 😎1、性别枚举调整 2、调整字典服务 3、其他优化 2024-07-14 01:10:02 +08:00