 zer0Black
|
9498a5c745
|
处理eslint问题
|
2023-08-14 18:45:08 +08:00 |
|
|
zer0Black
|
cf97800d48
|
升级版本整体到2.5.0
|
2023-08-14 18:24:02 +08:00 |
|
|
zer0Black
|
5ccd5cdd05
|
Merge remote-tracking branch 'origin/feature-ui-fix'
# Conflicts:
# jero-web/src/views/modules/message/SysMessageList.vue
# jero-web/src/views/modules/message/SysMessageTemplateList.vue
# jero-web/src/views/system/DepartList.vue
# jero-web/src/views/system/DepartListSync.vue
# jero-web/src/views/system/DictList.vue
# jero-web/src/views/system/QuartzJobList.vue
# jero-web/src/views/system/SysCategoryList.vue
# jero-web/src/views/system/SysCheckRuleList.vue
# jero-web/src/views/system/SysDataSourceList.vue
# jero-web/src/views/system/SysFillRuleList.vue
# jero-web/src/views/system/UserList.vue
# jero-web/src/views/system/modules/PasswordModal.vue
# jero-web/src/views/system/modules/UserModal.vue
# jero-web/src/views/system/modules/UserRoleModal.vue
|
2023-08-14 17:56:46 +08:00 |
|
|
zhoulingpo
|
c0865aa20e
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-08-04 18:01:46 +08:00 |
|
|
zhoulingpo
|
2e963262b6
|
“增加权限”
|
2023-08-04 18:00:53 +08:00 |
|
|
bupengxiang
|
6b6d187822
|
【修改】 修改日志问题时的残留问题
|
2023-08-04 17:39:56 +08:00 |
|
|
bupengxiang
|
bfbd08661f
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-08-04 17:13:24 +08:00 |
|
|
bupengxiang
|
02d1eb34e3
|
【修改】 修改查询重置 垂直越权问题 我的消息
|
2023-08-04 17:13:14 +08:00 |
|
|
zhoulingpo
|
12ce0ac76c
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-08-04 16:51:20 +08:00 |
|
|
zhoulingpo
|
2ed9dd63cc
|
【修改】统一间距 按钮修改 增加权限
|
2023-08-04 16:51:01 +08:00 |
|
|
bupengxiang
|
8662bb5bdf
|
【修改】 修改sql监控无法登录问题
|
2023-08-04 15:43:10 +08:00 |
|
|
bupengxiang
|
459a1c084f
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-08-04 14:44:12 +08:00 |
|
|
bupengxiang
|
24edbcca12
|
【修改】 修改菜单名称 添加模块名前缀 修改db文件
|
2023-08-04 14:43:58 +08:00 |
|
|
zhoulingpo
|
fe0c3b7df1
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-08-04 11:01:41 +08:00 |
|
|
zhoulingpo
|
eab0975fae
|
【修改】统一间距 按钮修改 增加权限
|
2023-08-04 11:00:48 +08:00 |
|
|
bupengxiang
|
575fd04b48
|
【修改】 用户实体 改DTO
|
2023-08-04 10:53:52 +08:00 |
|
|
bupengxiang
|
adf6c22c37
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-08-04 10:27:53 +08:00 |
|
|
bupengxiang
|
5523066fe4
|
【修改】 用户操作日志
|
2023-08-04 10:27:16 +08:00 |
|
|
zhoulingpo
|
97277c520a
|
【修改】统一间距 按钮修改 增加权限
|
2023-08-03 18:00:10 +08:00 |
|
|
zhoulingpo
|
6e69b77c13
|
【修改】统一间距 按钮修改 增加权限
|
2023-08-03 17:28:37 +08:00 |
|
|
zhoulingpo
|
b90805cb6b
|
【修改】统一间距 按钮修改 增加权限
|
2023-08-03 15:05:08 +08:00 |
|
|
zhoulingpo
|
5b98e8f86f
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-08-03 11:25:19 +08:00 |
|
|
zhoulingpo
|
31e3f020c8
|
【修改】头部修改间距
|
2023-08-03 11:25:06 +08:00 |
|
|
bupengxiang
|
8e7ac0a0d8
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-08-03 10:19:37 +08:00 |
|
|
bupengxiang
|
ae9468a9ea
|
【修改】 消息中心-系统报告，模板管理，消息管理 按钮水平越权 （修改db文件）
|
2023-08-03 10:19:28 +08:00 |
|
|
zhoulingpo
|
4805b6acde
|
【修改】头部修改间距
|
2023-08-02 16:21:25 +08:00 |
|
|
zhoulingpo
|
0685ef414a
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-08-02 16:19:40 +08:00 |
|
|
zhoulingpo
|
22d96d5d53
|
【修改】头部修改间距
|
2023-08-02 16:19:32 +08:00 |
|
|
bupengxiang
|
b99ce3f987
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-08-02 16:03:21 +08:00 |
|
|
bupengxiang
|
1c6e429fe6
|
【修改】 tomcat升级 9.0.69
|
2023-08-02 16:03:11 +08:00 |
|
|
zhoulingpo
|
d16fc829c0
|
【修改】修改tab
|
2023-08-02 15:11:22 +08:00 |
|
|
zhoulingpo
|
2659b186df
|
【修改】修改tab
|
2023-08-02 13:46:03 +08:00 |
|
|
zhoulingpo
|
74b939f1e3
|
【修改】修改tab
|
2023-08-02 13:44:08 +08:00 |
|
|
zhoulingpo
|
91ec2a61b6
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-08-02 10:42:17 +08:00 |
|
|
zhoulingpo
|
ae21424833
|
【修改】修改bug 修改框架样式
|
2023-08-02 10:41:59 +08:00 |
|
|
bupengxiang
|
d082febc19
|
【修改】 我的消息水平越权问题
|
2023-08-02 10:40:30 +08:00 |
|
|
bupengxiang
|
e7b5d5985d
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-08-02 10:40:06 +08:00 |
|
|
bupengxiang
|
d02c31ba49
|
【修改】 系统通告日志问题
|
2023-08-02 10:39:54 +08:00 |
|
|
zhoulingpo
|
8957bad2c8
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-08-01 17:58:07 +08:00 |
|
|
zhoulingpo
|
016206b7b3
|
【修改】修改bug 修改框架样式
|
2023-08-01 17:57:54 +08:00 |
|
|
bupengxiang
|
4e5bf36da4
|
【修改】 用户日志
|
2023-08-01 15:13:13 +08:00 |
|
|
bupengxiang
|
81779422bb
|
【修改】 回收站彻底删除
|
2023-08-01 10:03:20 +08:00 |
|
|
bupengxiang
|
77a1945d04
|
【修改】 角色管理删除用户
|
2023-08-01 09:48:42 +08:00 |
|
|
bupengxiang
|
048edb8547
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-07-31 18:05:00 +08:00 |
|
|
bupengxiang
|
02b421b022
|
【修改】 日志 操作类型
|
2023-07-31 18:03:40 +08:00 |
|
|
zhoulingpo
|
50788bb040
|
【修改】修改bug
|
2023-07-31 17:59:50 +08:00 |
|
|
zhoulingpo
|
b3768f1707
|
【修改】修改bug
|
2023-07-31 17:43:00 +08:00 |
|
|
zhoulingpo
|
eb39d86631
|
【修改】修改错误
|
2023-07-31 16:35:28 +08:00 |
|
|
zhoulingpo
|
cf7f499a2e
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-07-31 16:16:33 +08:00 |
|
|
bupengxiang
|
e3893bb752
|
Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix
|
2023-07-31 16:15:35 +08:00 |
|