gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,224 Commits 1 Branch 0 Tags 68 MiB
bc63fc87a8
Commit Graph

1224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PZ688
bc63fc87a8 refactor:调整图标大小 2025-02-27 17:33:23 +08:00
PZ688
4188534680 fix:修改图标尺寸 2025-02-27 17:19:53 +08:00
PZ688
ea26ff8f04 fix:merge 2025-02-27 17:18:26 +08:00
PZ688
dd7bdf5489 refactor:顶部栏语言切换 2025-02-27 17:07:51 +08:00
zuohuaijun
c8d6d7ce1e 😎代码清理 2025-02-27 16:27:16 +08:00
zuohuaijun
2c607ae49b Merge pull request '更新统计bug' (#277) from aq982 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/277
 2025-02-27 15:42:55 +08:00
PZ688
4b26bdddd4 fix: 2025-02-27 15:04:47 +08:00
PZ688
b543f1ffc0 feat:引入国旗图标组件 2025-02-27 15:01:29 +08:00
aq982
a0be731aa9 修改模板bug 2025-02-27 14:36:27 +08:00
aq982
bc3fbc84eb 修改模板统计功能 2025-02-27 14:29:58 +08:00
aq982
b0814c0156 修改统计模板 2025-02-27 14:28:30 +08:00
aq982
4c58e720d2 更新统计bug 2025-02-27 13:35:11 +08:00
zuohuaijun
47e838e6e2 Merge pull request 'v2' (#276) from suncaomei/Admin.NET.Pro:v2 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/276
 2025-02-27 13:23:28 +08:00
suncaomei
f8a1ae41f8 修复edit模板错误 2025-02-27 13:09:46 +08:00
suncaomei
b34515bfec Merge remote-tracking branch 'upstream/v2' into v2 2025-02-27 13:08:15 +08:00
zuohuaijun
0b12f68225 Merge pull request '修改list模板错误' (#275) from aq982 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/275
 2025-02-27 12:44:15 +08:00
aq982
0853907b8d 修改list模板错误 2025-02-27 12:40:37 +08:00
zuohuaijun
7b451f06a6 Merge pull request '调整模板的适用性' (#274) from aq982 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/274
 2025-02-27 12:39:40 +08:00
aq982
59504eed86 调整生成的适用性 2025-02-27 12:01:23 +08:00
PZ688
e7fe6ecc67 feat:引入vue-flag-icon国旗图标库 2025-02-27 11:57:05 +08:00
aq982
3ab3a30998 调整模板的适用性 2025-02-27 11:43:12 +08:00
zuohuaijun
5860e4e1e1 Merge pull request 'aq982' (#273) from aq982 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/273
 2025-02-27 11:04:40 +08:00
PZ688
8edd1fb6b8 feat:登录界面UI国际化 2025-02-27 10:48:50 +08:00
aq982
18f30c441b 修改(服务端)接口统计BUG 2025-02-27 10:04:16 +08:00
aq982
abdab25e6e 修改(服务端)接口服务生成统计的错误，更灵活，增加默认缓存和事件 2025-02-27 09:53:22 +08:00
PZ688
249c9f0f61 Merge remote-tracking branch 'upstream/v2' 2025-02-27 09:51:41 +08:00
zuohuaijun
2df313c500 Merge pull request '代码生成优化包括不限于以下功能：增加查询中间件Mid.cs，增加统计字段和GroupBy配置，增加表格底部根据字段配置统计字段统计，新增统计工具AggregationBuilder.cs' (#271) from aq982 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/271
 2025-02-27 02:53:21 +08:00
zuohuaijun
b05d692919 😎代码优化 2025-02-27 02:34:30 +08:00
suncaomei
7d0455b100 Merge remote-tracking branch 'upstream/aq982' into v2 2025-02-26 16:49:44 +08:00
PZ688
9179321610 fix:修改首页 2025-02-26 16:43:45 +08:00
PZ688
018db8336d fix:将zh-cn目录改成zh-CN目录等 2025-02-26 16:26:03 +08:00
zuohuaijun
bda4a683ea Merge pull request 'BUG:1、使用了DateTimeOffset导致个别环境下出现ORM转换错误。2、调用拦截器时的方法写错了。' (#272) from koy07555/Admin.NET.Pro:微信支付BUG into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/272
 2025-02-26 16:09:57 +08:00
aq982
8cf3c36813 Merge branch 'aq982' of https://code.adminnet.top/Admin.NET/Admin.NET.Pro into aq982 2025-02-26 15:56:41 +08:00
aq982
8677435176 代码生成优化 2025-02-26 15:55:26 +08:00
aq982
f031499cdd 代码生成优化包括不限于以下功能：增加查询中间件Mid.cs，增加统计字段和GroupBy配置，增加表格底部根据字段配置统计字段统计，新增统计工具AggregationBuilder.cs 2025-02-26 15:49:48 +08:00
yzp
e73d4bce5c BUG:1、使用了DateTimeOffset导致个别环境下出现ORM转换错误。2、调用拦截器时的方法写错了。 2025-02-26 14:58:41 +08:00
PZ688
2d0a5ad2fb fix:修改index.html文件 2025-02-26 14:48:56 +08:00
PZ688
288fc79052 feat:加入国际化文件 2025-02-26 14:39:55 +08:00
zuohuaijun
8fe140346e 😎优化字典组件 2025-02-25 23:47:14 +08:00
zuohuaijun
03ff581e2f 😎1、优化微信支付相关代码 2、修复代码生成字典映射 3、升级依赖 4、修复清理在线用户逻辑 2025-02-25 22:42:37 +08:00
zuohuaijun
59ff313d39 Merge pull request '补缺失文件' (#269) from koy07555/Admin.NET.Pro:优化微信支付功能 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/269
 2025-02-25 22:16:48 +08:00
yzp
0be6b52f53 补缺失文件 2025-02-25 22:13:58 +08:00
zuohuaijun
92da75674b Merge pull request '优化微信支付功能，BUG:1、前端创建定单界面错误 2、退款没有使用回调接口 3、退款记录的关键字段传值有误 Fix:增加事件接截器' (#268) from koy07555/Admin.NET.Pro:优化微信支付功能 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/268
 2025-02-25 18:13:08 +08:00
yzp
1073066309 优化微信支付功能，BUG:1、前端创建定单界面错误 2、退款没有使用回调接口 3、退款记录的关键字段传值有误 Fix:增加事件接截器 2025-02-25 10:19:01 +08:00
suncaomei
894baed53f Merge remote-tracking branch 'upstream/v2' into v2 
# Conflicts:
#	Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs
 2025-02-24 12:46:09 +08:00
zuohuaijun
1358cd397d 😎1、优化MQTT相关 2、升级依赖 2025-02-23 03:10:34 +08:00
zuohuaijun
7e1cdeaffa Merge pull request '优化MQTT功能' (#266) from koy07555/Admin.NET.Pro:优化MQTT功能 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/266
 2025-02-22 14:29:58 +08:00
yzp
102b336a85 补缺失依懒 2025-02-22 08:46:28 +08:00
yzp
e3f9975657 补缺失文件 2025-02-22 08:40:10 +08:00
zuohuaijun
3f30f2ea5a Merge pull request '增加 MqttEventHandler 类用于处理Mqtt业务相关的事件，使框架初始化的核心代码不需要根据业务的功能产生变化' (#265) from koy07555/Admin.NET.Pro:优化MQTT功能 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/265
 2025-02-21 20:36:23 +08:00