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

2011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zuohuaijun
4971ca7144 Merge pull request '修复代码生成类型错误' (#77) from IMaster/Admin.NET.Pro:template into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/77
 2024-07-24 09:52:18 +08:00
Master
f83d08c8f0 修复代码生成类型错误 2024-07-24 09:04:18 +08:00
zuohuaijun
fcd3de2585 😎1、增加代码生成自定义外链字段 2、修复同步行政区域时一级区域缺少code编码问题 2024-07-24 01:44:43 +08:00
zuohuaijun
6726b2e739 😎代码生成模板格式调整 2024-07-24 01:14:26 +08:00
wang-li147258
aceae3d526 Merge pull request '代码生成模板适配最新授权方式' (#75) from text01 into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/75
 2024-07-23 21:34:06 +08:00
wangli
8d6f3a5c72 代码生成模板适配最新授权方式 2024-07-23 15:05:46 +08:00
shuerchoi
ea07a0216c Merge pull request 'main' (#7) from Admin.NET/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/shuerchoi/Admin.NET.Pro/pulls/7
 2024-07-23 11:31:26 +08:00
zuohuaijun
fa8bdb15f8 Merge pull request 'main' (#72) from coolcalf/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/72
 2024-07-23 01:36:18 +08:00
coolcalf
e3feb6cad8 fixed: 微信支付证书路径问题 2024-07-22 23:01:56 +08:00
coolcalf
1ca94438a1 Merge pull request 'main' (#4) from Admin.NET/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/coolcalf/Admin.NET.Pro/pulls/4
 2024-07-22 22:59:26 +08:00
zuohuaijun
89949d4dc7 😎代码清理 2024-07-22 22:52:56 +08:00
zuohuaijun
9a68462b9d Merge pull request '优化SysWechatPayService：查询后，将支付关闭信息写入支付记录' (#71) from coolcalf/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/71
 2024-07-22 17:54:59 +08:00
coolcalf
fdf165b053 将微信支付关闭状态(CLOSED)写入到支付记录中 2024-07-22 17:37:19 +08:00
coolcalf
1d0a22572d Merge pull request 'main' (#3) from Admin.NET/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/coolcalf/Admin.NET.Pro/pulls/3
 2024-07-22 17:31:33 +08:00
shuerchoi
bb46b55891 Merge pull request 'main' (#6) from Admin.NET/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/shuerchoi/Admin.NET.Pro/pulls/6
 2024-07-22 09:57:20 +08:00
zuohuaijun
bca1a7ad35 😎按钮权限标识格式修改 2024-07-22 02:56:14 +08:00
zuohuaijun
e0398303fa 😎调整接口与按钮权限对应 2024-07-22 02:54:41 +08:00
zuohuaijun
c6c49b31a4 😎代码优化 2024-07-21 17:08:33 +08:00
zuohuaijun
c61c12325b Merge pull request '控制台显示正在初始化的表和种子数据' (#70) from coolcalf/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/70
 2024-07-21 16:47:16 +08:00
zuohuaijun
245c52214b Merge pull request '修复用户编辑界面，添加多个附属机构时页面太长而无法显示的问题' (#69) from skywolf627/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/69
 2024-07-21 16:47:03 +08:00
coolcalf
8361c21532 控制台显示正在初始化的表和种子数据 
支持拆分表数据初始化
菜单icon增加默认值
 2024-07-21 16:32:44 +08:00
coolcalf
357cfb57d7 Merge pull request 'main' (#2) from Admin.NET/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/coolcalf/Admin.NET.Pro/pulls/2
 2024-07-21 15:51:26 +08:00
skywolf627
2f5a0784f6 修复用户编辑界面，添加多个附属机构时页面太长而无法显示的问题 2024-07-21 15:10:51 +08:00
zuohuaijun
2d96e3aebf Merge pull request '修复添加机构后，机构列表不会更新的问题' (#68) from skywolf627/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/68
 2024-07-21 11:08:24 +08:00
zuohuaijun
76320909c1 😎升级Furion v4.9.4.7 2024-07-21 11:08:07 +08:00
skywolf627
4bc17a3be6 修复添加机构后，机构列表不会更新的问题 2024-07-21 10:52:02 +08:00
zuohuaijun
f52f7aa1ed 😎限制删除被开放接口绑定的用户和租户 2024-07-20 23:24:16 +08:00
zuohuaijun
1567099226 😎调整优化日程相关代码和升级npm依赖 2024-07-20 16:25:10 +08:00
zuohuaijun
4a07a213fd 😎升级nuget包依赖 2024-07-20 15:33:02 +08:00
IMaster
2f1c8a00a9 Merge pull request '避免前端警告 tagType 为 ""' (#67) from orzsoft_admin/Admin.NET.Pro:template into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/67
 2024-07-19 18:29:40 +08:00
Master
b1c1d64973 纠正错误的逻辑 2024-07-19 18:26:20 +08:00
Master
86519d69fe 避免前端警告 tagType 为 "" 2024-07-19 18:24:42 +08:00
zuohuaijun
a47ded2605 Merge pull request '删除重复的枚举扩展 添加Theme到字典数据库' (#66) from orzsoft_admin/Admin.NET.Pro:template into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/66
 2024-07-19 13:52:01 +08:00
shuerchoi
6242834a7d Merge pull request 'main' (#5) from Admin.NET/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/shuerchoi/Admin.NET.Pro/pulls/5
 2024-07-19 09:38:43 +08:00
Master
139f000b39 删除重复的枚举扩展 
添加Theme到字典数据库
更新字典数据库
 2024-07-19 09:32:25 +08:00
zuohuaijun
c556ed05a3 Merge pull request '编辑页面字典下拉框显示name' (#65) from suncaomei/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/65
 2024-07-19 00:46:56 +08:00
CAOMEI\s
57d6bbd874 编辑页面字典下拉框显示name 2024-07-19 00:45:26 +08:00
zuohuaijun
5e0b3c4cb1 Merge pull request '修改前端index.vue字典使用value值为存储值查询' (#64) from suncaomei/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/64
 2024-07-19 00:42:17 +08:00
CAOMEI\s
25dce06bfd 修改前端index.vue字典使用value值为存储值查询 2024-07-19 00:36:31 +08:00
zuohuaijun
d6cbbee1e0 😎删除多余的调试和打印 2024-07-18 17:59:01 +08:00
zuohuaijun
ac630a2d07 😎优化判断 2024-07-18 17:49:22 +08:00
zuohuaijun
1faff96638 😎增加事件总线广播消息功能 2024-07-18 17:48:15 +08:00
shuerchoi
235650d1c9 Merge pull request 'main' (#4) from Admin.NET/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/shuerchoi/Admin.NET.Pro/pulls/4
 2024-07-18 13:12:40 +08:00
zuohuaijun
3eb7f2e14f 😎兼容createTime可空模式 2024-07-18 11:28:17 +08:00
zuohuaijun
e8daf7aa5b 😎1、优化SignalR配置 2、恢复消息发送 2024-07-18 00:51:07 +08:00
zuohuaijun
572b3bf72f 😎更新接口请求文件 2024-07-17 21:15:41 +08:00
zuohuaijun
b4632cfffd 😎默认node内存8G 2024-07-17 20:39:22 +08:00
许俊杰
e8a471efba style: 调整代码写法避免可空警告 2024-07-17 18:30:44 +08:00
zuohuaijun
00da8d15a2 😎升级npm依赖 2024-07-17 18:18:28 +08:00
zuohuaijun
0b79002afb 😎1、优化种子判断 2、默认开启redis事件源 3、优化行政区域处理 2024-07-17 18:01:34 +08:00