gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 1895fe4c9d Merge pull request '移除代码生成器中按照时间排序导致前端如果传入field:createTime会出现"SqlSugar.SqlSugarException: 在排序依据列表中多次指定了某一列。排序依据列表中的列必须是唯一的。"的错误' (#59) from suncaomei/Admin.NET.Pro:main into main zuohuaijun 2024-07-17 01:03:55 +0800
  • e1957dc7df 移除代码生成器中按照时间排序导致前端如果传入field:createTime会出现"SqlSugar.SqlSugarException: 在排序依据列表中多次指定了某一列。排序依据列表中的列必须是唯一的。"的错误 CAOMEI\s 2024-07-17 01:01:39 +0800
  • 88fc37c75c Merge pull request '需要将表达式中的 Expression.Or 替换为 Expression.OrElse。在表达式树中，Expression.Or 对应于位运算符 OR（|），而 Expression.OrElse 对应于逻辑运算符 OR（||），后者才是 SQL 中使用的正确逻辑运算符。' (#58) from suncaomei/Admin.NET.Pro:main into main zuohuaijun 2024-07-16 23:10:52 +0800
  • dc2117a3d8 需要将表达式中的 Expression.Or 替换为 Expression.OrElse。在表达式树中，Expression.Or 对应于位运算符 OR（|），而 Expression.OrElse 对应于逻辑运算符 OR（||），后者才是 SQL 中使用的正确逻辑运算符。 CAOMEI\s 2024-07-16 23:07:55 +0800
  • 80745e5cb4 Merge pull request '修正字典匹配' (#57) from orzsoft_admin/Admin.NET.Pro:template into main zuohuaijun 2024-07-16 20:33:33 +0800
  • 15fec5d2c8 修正字典匹配 Master 2024-07-16 19:08:22 +0800
  • cfb09f9f45 😎统一时间为UTC格式：Now => UtcNow zuohuaijun 2024-07-16 18:06:39 +0800
  • 731950d699 😎1、优化字典获取 2、调整首页组件 zuohuaijun 2024-07-16 18:02:51 +0800
  • b943a7850b 😎升级Furion v4.9.4.6 zuohuaijun 2024-07-16 17:17:17 +0800
  • 634e24eb09 Merge pull request '修改所有列表页面 加载效果' (#56) from orzsoft_admin/Admin.NET.Pro:template into main zuohuaijun 2024-07-16 17:10:19 +0800
  • 7d756f3c1e 修改所有列表页面 加载效果 Master 2024-07-16 16:07:57 +0800
  • 755f7d4e78 😎修复获取字典错误 zuohuaijun 2024-07-16 15:59:49 +0800
  • 4f6fc8da4e 😎增加获取机器序列号接口 zuohuaijun 2024-07-16 13:03:18 +0800
  • 2cc272c001 😎增加首页显示系统名称 zuohuaijun 2024-07-16 12:35:38 +0800
  • d43f860d7a Merge pull request '首页日程增加删除按钮' (#54) from orzsoft_admin/Admin.NET.Pro:template into main zuohuaijun 2024-07-16 12:34:20 +0800
  • d0c6fb5b72 更新日程删除提示 Master 2024-07-16 11:46:14 +0800
  • 9cd0ce6647 首页日程增加删除按钮 Master 2024-07-16 11:41:34 +0800
  • 772e018126 😎消除编译器警告 zuohuaijun 2024-07-16 11:09:24 +0800
  • c635a5d505 😎调整代码生成模板 zuohuaijun 2024-07-16 10:56:58 +0800
  • 15054976bc 😎首页日程增加农历显示 zuohuaijun 2024-07-16 10:53:15 +0800
  • e76ea05a6d Merge pull request '修复信息回显' (#52) from orzsoft_admin/Admin.NET.Pro:main into main zuohuaijun 2024-07-16 10:49:48 +0800
  • 01cd210fb4 Merge pull request '代码生成模版统一分页查询实体名' (#53) from orzsoft_admin/Admin.NET.Pro:template into main zuohuaijun 2024-07-16 10:49:35 +0800
  • 4c5ad304c2 代码生成模板统一分页查询实体名 Master 2024-07-16 10:13:25 +0800
  • 9d8bc323da 修复信息回显 IMaster 2024-07-16 09:18:36 +0800
  • 2a4efa76a4 Merge remote-tracking branch 'upstream/main' into template Master 2024-07-16 08:23:21 +0800
  • 68a40e67b3 😎调整代码生成模板 zuohuaijun 2024-07-16 00:45:59 +0800
  • 5f9305ebf7 Merge branch 'main' of http://101.43.53.74:3000/Admin.NET/Admin.NET zuohuaijun 2024-07-16 00:41:51 +0800
  • 318c03cac4 😎1、增加首页我的日程组件 2、其他优化 zuohuaijun 2024-07-16 00:41:41 +0800
  • fe0dfc0c68 Merge pull request '删除多余的禁用判断' (#50) from orzsoft_admin/Admin.NET.Pro:main into main zuohuaijun 2024-07-15 19:56:34 +0800
  • 8142f3fb6c 删除多余的禁用判断 IMaster 2024-07-15 14:47:30 +0800
  • f6817a51ae Merge remote-tracking branch 'upstream/main' into template Master 2024-07-15 14:45:46 +0800
  • ae7f54c4d6 😎增加文件上传时格式和大小显示 zuohuaijun 2024-07-15 14:43:07 +0800
  • acf1ea7d1b 😎1、调整系统配置参数与常量 2、去掉无效的接口（获取水印配置） zuohuaijun 2024-07-15 14:16:15 +0800
  • 8566071d0c Merge pull request 'main' (#2) from Admin.NET/Admin.NET.Pro:main into main shuerchoi 2024-07-15 13:31:59 +0800
  • 1569f61bf3 😎增加字典值时更新缓存 zuohuaijun 2024-07-15 12:49:34 +0800
  • 91c61d9da5 😎1、统一系统标题 2、调整配置为常量 3、优化logo上传 4、优化行政区域入库性能 5、增加权限标记特性 6、调整在线用户 zuohuaijun 2024-07-15 11:38:17 +0800
  • 612e82f741 Merge remote-tracking branch 'upstream/main' into template Master 2024-07-15 10:08:13 +0800
  • aad1352f15 Merge pull request '更新 Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WxOpenInput.cs' (#48) from 362270511/Admin.NET.Pro:main into main zuohuaijun 2024-07-15 10:04:05 +0800
  • 01024a8088 更新 Admin.NET/Admin.NET.Core/Service/Wechat/Dto/WxOpenInput.cs 362270511 2024-07-15 10:01:56 +0800
  • 022deacdcd Merge pull request '添加微信小程序消息发送签名验证方法' (#47) from 362270511/Admin.NET.Pro:main into main zuohuaijun 2024-07-15 02:51:33 +0800
  • 31cc8fd274 😎调整定时任务持久化等相关代码 zuohuaijun 2024-07-14 16:42:14 +0800
  • 30a935e105 😎修改首页欢迎组件标题 zuohuaijun 2024-07-14 16:33:14 +0800
  • a588c38369 😎1、性别枚举调整 2、调整字典服务 3、其他优化 zuohuaijun 2024-07-14 01:10:02 +0800
  • 1db321346b 更新 Admin.NET/Admin.NET.Core/Service/Wechat/SysWxOpenService.cs 362270511 2024-07-13 11:12:47 +0800
  • 00ce696538 Merge pull request 'main' (#1) from Admin.NET/Admin.NET.Pro:main into main 362270511 2024-07-13 11:10:35 +0800
  • 2e3149a028 😎修复授权角色接口资源bug zuohuaijun 2024-07-13 00:17:32 +0800
  • af2fd572d5 😎1、获取缓存值若Key经过URL编码则进行解码 2、优化枚举转字典 3、升级npm包依赖 zuohuaijun 2024-07-12 23:08:47 +0800
  • 28a0204924 Merge pull request '🏂简化Vxe日期时间列显示格式' (#44) from KaneLeung/Admin.NET.Pro:main into main zuohuaijun 2024-07-12 14:33:38 +0800
  • 5385e86478 😎1、增加导入Excel数据并错误标记接口 2、增加下载已标记错误的临时Excel文件接口 zuohuaijun 2024-07-12 14:29:34 +0800
  • 8bb9505af7 😎插件工程代码同步与清理 zuohuaijun 2024-07-12 14:23:28 +0800
  • 6c04284d26 😎样式调整 zuohuaijun 2024-07-12 13:17:02 +0800
  • 71bf98a682 😎代码生成增加着重显示 zuohuaijun 2024-07-12 11:26:46 +0800
  • 7c0222e3fc Merge pull request 'main' (#1) from Admin.NET/Admin.NET.Pro:main into main coolcalf 2024-07-12 10:41:31 +0800
  • 365300cf65 🫰修复index.vue.vm重置操作缺少 async Close #45 KaneLeung 2024-07-12 10:22:34 +0800
  • 4a45c53897 Merge remote-tracking branch 'upstream/main' into template Master 2024-07-12 09:05:41 +0800
  • 1b3ac27958 🏂简化Vxe日期时间列显示格式 KaneLeung 2024-07-12 08:43:23 +0800
  • a55937bde9 😎调整代码生成管理页面 zuohuaijun 2024-07-12 02:45:36 +0800
  • 5e773c8830 😎调整代码生成管理页面 zuohuaijun 2024-07-12 02:03:39 +0800
  • b90eba041d 😎统一分页接口参数命名格式 zuohuaijun 2024-07-12 01:42:45 +0800
  • 9c748aa2ce 😎更新接口请求文件 zuohuaijun 2024-07-12 01:17:06 +0800
  • e8eb01b165 😎调整基础接口资源（记得重新生成下该表数据） zuohuaijun 2024-07-12 00:47:46 +0800
  • 47775c42ce 😎1、升级Furion v4.9.4.5等 2、代码调整 zuohuaijun 2024-07-12 00:40:25 +0800
  • 6614392375 Merge pull request '更新 Web/src/stores/userInfo.ts' (#43) from 362270511/Admin.NET.Pro:main into main zuohuaijun 2024-07-12 00:18:37 +0800
  • 6105272429 Merge pull request '🏂简化Vxe日期时间列显示格式' (#41) from KaneLeung/Admin.NET.Pro:main into main zuohuaijun 2024-07-12 00:17:55 +0800
  • 3372d9b743 同步模版 Master 2024-07-11 19:28:28 +0800
  • 7deab039a9 更新 Web/src/stores/userInfo.ts 362270511 2024-07-11 18:49:58 +0800
  • 9f9f666a62 🙄优化切换一级菜单后没有背景色块 KaneLeung 2024-07-11 15:10:54 +0800
  • db845f85b7 😵修复一级菜单点击无响应的问题 KaneLeung 2024-07-11 14:52:15 +0800
  • 0f1b7b8dbe 同步模版 Master 2024-07-11 14:47:43 +0800
  • 5a66a88d8f 🏂简化Vxe日期时间列显示格式 KaneLeung 2024-07-11 14:33:18 +0800
  • a9f719a9b5 Merge pull request 'api_build add all group' (#39) from orzsoft_admin/Admin.NET.Pro:template into main zuohuaijun 2024-07-11 09:49:09 +0800
  • 70c1efa126 add api_build all group Master 2024-07-11 09:09:05 +0800
  • aba7ccc6a8 Merge remote-tracking branch 'upstream/main' into template Master 2024-07-11 09:06:44 +0800
  • 17dd1e0c77 😎升级Furion v4.9.4.4 zuohuaijun 2024-07-11 02:59:44 +0800
  • 70753826b7 😎调整代码生成列表倒序 zuohuaijun 2024-07-11 02:58:12 +0800
  • 4cc0891642 😎调整字典编辑页面不自动关闭 zuohuaijun 2024-07-11 02:54:22 +0800
  • 02c8d53f2b 😎调整字典管理页面 zuohuaijun 2024-07-11 02:51:21 +0800
  • 2cac309356 😎调整日志默认排序 zuohuaijun 2024-07-11 01:35:06 +0800
  • 72fff27fa6 😎调整文件管理页面 zuohuaijun 2024-07-11 01:32:03 +0800
  • 0840904462 😎修改域用户管理页面 zuohuaijun 2024-07-11 01:17:53 +0800
  • e06ddafce6 😎调整日志相关管理页面 zuohuaijun 2024-07-11 01:13:59 +0800
  • c88067ac0b 😎调整消息通知管理页面 zuohuaijun 2024-07-11 00:56:07 +0800
  • ec4b8cacfe 😎调整三方账号管理页面 zuohuaijun 2024-07-11 00:52:59 +0800
  • 323c1aa8d6 😎调整在线用户页面 zuohuaijun 2024-07-11 00:48:37 +0800
  • d1089b50f7 😎调整开放接口管理页面 zuohuaijun 2024-07-11 00:42:56 +0800
  • c1789fa20d 😎调整机构管理页面 zuohuaijun 2024-07-11 00:38:57 +0800
  • db117fe8ed 😎调整插件管理页面 zuohuaijun 2024-07-11 00:27:56 +0800
  • 75ef66d194 😎调整职位管理页面 zuohuaijun 2024-07-11 00:24:29 +0800
  • 1f6727b654 😎调整打印模板管理页面 zuohuaijun 2024-07-11 00:20:26 +0800
  • 80206482ad 😎调整行政区域管理页面 zuohuaijun 2024-07-11 00:09:49 +0800
  • 33368c910c 😎调整用户管理页面 zuohuaijun 2024-07-11 00:04:43 +0800
  • e2110487f3 😎调整角色管理页面 zuohuaijun 2024-07-10 23:50:56 +0800
  • 3c45745ecc 😎调整租户管理页面 zuohuaijun 2024-07-10 23:40:32 +0800
  • c0b47ae881 Merge pull request '修复代码生成器错误 修复高级查询按Enter键会刷新页面table的问题' (#38) from suncaomei/Admin.NET.Pro:main into main zuohuaijun 2024-07-10 22:56:02 +0800
  • 775b284c37 😎1、超管可以获取样式 2、调整样式 zuohuaijun 2024-07-10 22:55:19 +0800
  • c8e0267241 修复高级查询按Enter键会刷新页面table的问题 CAOMEI\s 2024-07-10 22:05:08 +0800
  • c04a902fb8 修复代码生成器错误 CAOMEI\s 2024-07-10 20:42:07 +0800
  • 3eb2fe86f3 😎代码优化 zuohuaijun 2024-07-10 13:32:10 +0800
  • 1d12c06676 😎代码格式化 zuohuaijun 2024-07-10 12:59:32 +0800
  • 3d3c32084d Merge pull request '系统配置、系统菜单 VXE table 页面调整' (#33) from shuerchoi/Admin.NET.Pro:main into main zuohuaijun 2024-07-10 12:55:36 +0800