Commit Graph

707 Commits

Author SHA1 Message Date
aeizzz
b392a47426 🐛 Fixing a bug. 修改表单为两列 2023-03-10 16:42:04 +08:00
aeizzz
e5af22cb3d 🐛 Fixing a bug. 修改左侧微信公众号选择的搜索条件 2023-03-10 16:16:43 +08:00
aeizzz
0d050bc771 🐛 Fixing a bug. 修改自动回复中的表格高度 2023-03-10 15:55:27 +08:00
aeizzz
bc15575851 🐛 Fixing a bug. 自动回复 2023-03-10 15:36:10 +08:00
aeizzz
01fe8ac33a 🐛 Fixing a bug. 修改微信标签的删除bug 2023-03-10 13:13:15 +08:00
aeizzz
890a7a00ff 🐛 Fixing a bug. 修改选择素材的bug 2023-03-10 10:38:19 +08:00
aeizzz
5f34301978 🐛 Fixing a bug. 修改url正则表达式,修改公众号账号管理 2023-03-10 10:22:39 +08:00
aeizzz
90c8e6aba5 🐛 Fixing a bug. 用户管理用户名校验 2023-03-10 09:11:09 +08:00
aeizzz
764c499ad1 🐛 Fixing a bug. 用户管理用户名校验 2023-03-10 09:10:47 +08:00
aeizzz
a50bdb7688 Merge remote-tracking branch 'origin/leng_dev' into lei_dev 2023-03-09 19:01:26 +08:00
aeizzz
4d1dc78082 🐛 Fixing a bug. app角色导入路径 2023-03-09 19:01:09 +08:00
lbw
587df92a35 ♻️ Refactoring code. 重构前端 api url 保持原有微服务请求前缀方式 2023-03-09 18:46:49 +08:00
lbw
400c9ccecd Merge remote-tracking branch 'origin/lei_dev' into leng_dev
# Conflicts:
#	src/api/app/appuser.ts
#	src/components/Upload/Excel.vue
2023-03-09 18:43:57 +08:00
lbw
5472d7593d ♻️ Refactoring code. 重构前端 api url 保持原有微服务请求前缀方式 2023-03-09 18:41:36 +08:00
aeizzz
bcb69a7c48 🐛 Fixing a bug. app 第三方编辑问题 2023-03-09 18:36:28 +08:00
aeizzz
8ffcb985b7 🐛 Fixing a bug. excel导入国际化不对 2023-03-09 18:29:13 +08:00
aeizzz
18aa8a88b5 🐛 Fixing a bug. 修改客户管理bug 2023-03-09 18:26:42 +08:00
aeizzz
2abdf8d4fa Introducing new features. 退出时调用退出接口 2023-03-09 17:52:59 +08:00
aeizzz
3f81bc8cfa Introducing new features.修改锁屏文件,修改首页的用户展示错误 2023-03-09 17:42:07 +08:00
lbw
d8603d88fd Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-09 17:33:31 +08:00
aeizzz
16c2ed0079 Merge remote-tracking branch 'origin/leng_dev' into lei_dev 2023-03-09 17:24:33 +08:00
lbw
d412a9ea43 fix: 去掉表格border 2023-03-09 16:44:47 +08:00
aeizzz
12c95f3db6 Introducing new features. 修改模型管理中表单样式 2023-03-09 13:48:22 +08:00
aeizzz
1bd806239b 🐛 Fixing a bug. 三方管理中修改脱敏后保存的bug 2023-03-09 13:46:34 +08:00
lbw
4ecc06b17d feat: 富文本支持文件上传功能 2023-03-09 13:45:24 +08:00
aeizzz
b325960c95 🐛 Fixing a bug. 定时任务根据内容不同展示不同表单 2023-03-09 13:39:37 +08:00
aeizzz
b3ee53dc8f 🐛 Fixing a bug. 修改密码等级不生效的问题 2023-03-09 13:12:47 +08:00
lbw
c39a034fb2 fix: 流程图携带token 2023-03-09 13:03:12 +08:00
aeizzz
1bd3e030e3 🐛 Fixing a bug. 修改代码生成器页面bug 2023-03-09 11:25:54 +08:00
aeizzz
44eefc68f9 🐛 Fixing a bug. 系统管理 国际化管理幂等性问题 2023-03-09 09:12:31 +08:00
aeizzz
bdc815a39d 🐛 Fixing a bug. 系统管理 参数管理幂等性判断 2023-03-09 08:55:23 +08:00
aeizzz
aabc6272fe Merge remote-tracking branch 'origin/leng_dev' into lei_dev 2023-03-09 08:31:32 +08:00
aeizzz
7b72e0e511 🐛 Fixing a bug. 锁屏对接后台密码校验 2023-03-08 18:11:39 +08:00
lbw
a64e0223d2 fix: 租户菜单、参数等幂等判断 2023-03-08 17:45:35 +08:00
aeizzz
db943d5143 🐛 Fixing a bug. 修改路由缓存问题 2023-03-08 17:24:35 +08:00
lbw
c341acbd1f feat: 增加幂等性判断 2023-03-08 16:40:12 +08:00
lbw
121d24b2e4 ♻️ Refactoring code. 重构表单校验规则 2023-03-08 16:07:13 +08:00
lbw
11f77005ff Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-08 16:06:40 +08:00
lbw
780c69459f feat: 优化代码结构 2023-03-08 15:22:28 +08:00
lbw
18c0941817 fix: 部门新增不显示问题 2023-03-08 15:08:24 +08:00
aeizzz
b90d5ef043 🐛 Fixing a bug. 修改内链组件属性过期引起的警告 2023-03-08 14:19:12 +08:00
aeizzz
8b543e5c2d 🐛 Fixing a bug. 固定用户列和序号,日志增加创建人 2023-03-08 14:13:00 +08:00
lbw
ade034e96d ref: 优化websocket 链接 2023-03-08 13:17:42 +08:00
lbw
f0b0347769 Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-08 12:49:43 +08:00
lbw
2be10fe044 feat: 水印自动包含当前用户名 2023-03-08 12:24:38 +08:00
aeizzz
7e4085ca58 🐛 Fixing a bug. 修改基本信息维护编辑报错,修改第三方账号解绑失败时没有提示,增加登录回车调用事件 2023-03-08 12:22:58 +08:00
aeizzz
46c6d2d676 Introducing new features. 完善i18n 异步加载的问题 2023-03-08 12:05:31 +08:00
lbw
1b902e65b1 fix: 系统管理 终端管理 增删改查 无法编辑,callback 事件没有 2023-03-08 11:33:46 +08:00
lbw
4c153fc70d bug: fix 注册失败问题 2023-03-07 23:05:24 +08:00
lbw
af6504007a Merge remote-tracking branch 'origin/hui_dev' into leng_dev
# Conflicts:
#	src/components/Upload/index.vue
#	src/views/admin/user/index.vue
2023-03-07 22:47:31 +08:00
lbw
621057a2d7 🐛 Fixing a bug. 登录失败错误信息提示 2023-03-07 22:46:34 +08:00
32189
7622aac202 🎉导入组件国际化 2023-03-07 17:39:02 +08:00
lbw
88f5889de4 ref: 国际化处理 2023-03-07 15:43:40 +08:00
32189
32075d0cf2 🎉国际化增加缓存接口 2023-03-07 15:13:49 +08:00
32189
0f50f2697c 🎉角色和菜单 固定列 2023-03-07 14:58:12 +08:00
lbw
0e0f5bfb68 Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-07 14:45:39 +08:00
aeizzz
23fb2fbac1 Introducing new features. 增加密码强度组件 2023-03-07 14:40:51 +08:00
lbw
49259fe57e Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-07 14:39:15 +08:00
lbw
4cadfd2029 feat: 优化前端样式 2023-03-07 14:14:13 +08:00
lbw
71b5086840 Merge remote-tracking branch 'origin/hui_dev' into leng_dev 2023-03-07 13:43:34 +08:00
aeizzz
37fd47d376 Introducing new features. 增加微信用户拉黑功能 2023-03-07 10:35:54 +08:00
lbw
cf40307847 fix: Local.getTenant 2023-03-07 10:22:31 +08:00
lbw
36b41392b5 Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-07 09:48:38 +08:00
lbw
4ffa036ebc ref: 优化Local 类导入 2023-03-07 09:46:17 +08:00
aeizzz
4e14df7237 Introducing new features. 【日志管理】 增加抽屉模板 展示全部信息信息 2023-03-07 09:42:08 +08:00
32189
ab17c9313b 🎉字典导出 2023-03-07 09:32:11 +08:00
aeizzz
26f1be2afc Introducing new features. 三方绑定移动到安全分组、增加解绑功能 2023-03-07 09:26:01 +08:00
lbw
fde413f0e8 feat: 优化获取当前令牌、当前租户的工具类 2023-03-07 09:25:59 +08:00
lbw
4b841f9b21 bug: 代办任务流程图不显示bug修复 2023-03-07 09:19:58 +08:00
lbw
2cbfa8506a Merge remote-tracking branch 'origin/hui_dev' into leng_dev 2023-03-07 09:18:46 +08:00
32189
f470f4c09d 🎉各个管理导出功能修复 2023-03-07 08:56:38 +08:00
lbw
a210488286 ref: 重构首页看板 2023-03-06 22:51:17 +08:00
lbw
99b5437d25 ref: 重构日程 2023-03-06 21:44:34 +08:00
lbw
57e454476e Merge remote-tracking branch 'origin/hui_dev' into leng_dev 2023-03-06 19:30:34 +08:00
lbw
c147454060 Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-06 19:30:29 +08:00
aeizzz
4b4751fc08 Introducing new features. 首页面板, schedule 2023-03-06 18:12:40 +08:00
lbw
c38a713bf7 ref: 前端样式调整 2023-03-06 17:29:06 +08:00
32189
15872532b4 🎉【终端管理】 校验规则编号:不为空, 小写、不能重复,
【quartz管理】 导出接口开发
2023-03-06 16:09:00 +08:00
32189
b41e7f1857 🎉app国际化 2023-03-06 14:35:17 +08:00
lbw
bf2f6b7917 Merge remote-tracking branch 'origin/lei_dev' into leng_dev
# Conflicts:
#	src/views/admin/user/index.vue
#	src/views/oa/leave_bill/index.vue
2023-03-06 14:13:06 +08:00
aeizzz
ce748fcfff Introducing new features. 首页面板 2023-03-06 14:10:36 +08:00
32189
54d455fb3e 🎉 2023-03-06 13:48:00 +08:00
aeizzz
b2a432cb3a Introducing new features. 首页面板 2023-03-06 13:46:42 +08:00
32189
e82cb95484 🎉 代办任务删除 2023-03-06 13:37:01 +08:00
32189
d4b968fc82 Merge remote-tracking branch 'origin/leng_dev' into hui_dev
# Conflicts:
#	src/views/oa/leave_bill/form.vue
#	src/views/oa/model/form.vue
#	src/views/oa/task/form.vue
#	src/views/oa/task/i18n/en.ts
#	src/views/oa/task/i18n/zh-cn.ts
#	src/views/oa/task/index.vue
2023-03-06 13:18:22 +08:00
32189
33aabdf701 🎉 代办任务删除,请假工单导出 2023-03-06 13:12:01 +08:00
lbw
38a38e546f fix: 【登录没有权限】 没有提示,且console 报错 2023-03-06 12:45:43 +08:00
aeizzz
25783fbb65 Introducing new features. 用户管理增加没有权限时的提示 2023-03-06 11:07:10 +08:00
lbw
7a29c1931f Merge remote-tracking branch 'origin/hui_dev' into leng_dev
# Conflicts:
#	src/api/oa/leave-bill.ts
#	src/api/oa/process.ts
#	src/views/admin/user/index.vue
#	src/views/oa/leave_bill/index.vue
#	src/views/oa/model/index.vue
#	src/views/oa/process/index.vue
2023-03-06 10:46:15 +08:00
aeizzz
749fa4347e Merge remote-tracking branch 'origin/hui_dev' into lei_dev
# Conflicts:
#	src/api/oa/leave-bill.ts
#	src/api/oa/process.ts
#	src/views/admin/user/index.vue
#	src/views/oa/leave_bill/index.vue
#	src/views/oa/model/index.vue
#	src/views/oa/process/index.vue
2023-03-06 10:45:00 +08:00
32189
788be16121 🎉 用户查询取消条件creat——time 2023-03-06 10:03:35 +08:00
32189
787bdf05ec 🎉 前端修改 2023-03-06 08:26:40 +08:00
lbw
ba619366c4 feat: 一堆功能优化 2023-03-04 22:49:42 +08:00
lbw
d058f62588 🎨 Improving structure / format of the code. 格式化代码 2023-03-04 20:56:15 +08:00
lbw
6564360905 feat: 代码优化 2023-03-04 20:13:48 +08:00
lbw
13497eb635 Merge remote-tracking branch 'origin/hui_dev' into leng_dev 2023-03-04 20:06:08 +08:00
32189
86b9a84a09 🎉 模型管理批量删除 2023-03-03 19:56:33 +08:00
lbw
b68eaadfb4 Merge remote-tracking branch 'origin/lei_dev' into leng_dev
# Conflicts:
#	package.json
2023-03-03 17:59:26 +08:00
aeizzz
87b31f9cce Introducing new features. 图标使用文件 个人页面bug修改 2023-03-03 17:54:24 +08:00
lbw
bb53480794 feat: 运行打开浏览器,删除无用路由 2023-03-03 17:30:07 +08:00
aeizzz
8d8c47e1da Merge remote-tracking branch 'origin/leng_dev' into lei_dev
# Conflicts:
#	src/utils/storage.ts
2023-03-03 17:29:43 +08:00
aeizzz
0a98c2bce0 Introducing new features. __NEXT_NAME__ 配置和格式化代码 2023-03-03 17:27:57 +08:00
aeizzz
0ca34f6b57 🐛 Fixing a bug. tagsViewName 正则匹配错误,匹配到含en单词 2023-03-03 17:12:53 +08:00
aeizzz
237edb87d1 🐛 Fixing a bug. tagsViewName正则匹配错误,匹配到含en单词 2023-03-03 16:58:51 +08:00
lbw
25d66aa421 Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-03 16:52:16 +08:00
aeizzz
744caa4a51 Introducing new features. 更新个人中心图标问题 2023-03-03 16:46:14 +08:00
lbw
4097e4468e Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-03 14:54:30 +08:00
lbw
af762e67aa 💄 优化表格布局,支持分页固定 2023-03-03 14:53:11 +08:00
aeizzz
184708724b Introducing new features. 完成本地svg图标的导入使用 2023-03-03 14:39:17 +08:00
lbw
c73a99f5a7 💄 优化表格布局,支持分页固定 2023-03-03 14:32:11 +08:00
lbw
7640876c0c refc: 个人中心页面移动在 admin/user 路径下方便维护 2023-03-03 13:46:57 +08:00
lbw
a3f614f67e 🐛 Fixing a bug. I18N 国际化KEY 重复,导致密码登录表单显示有问题 2023-03-03 11:31:40 +08:00
lbw
0052c85771 Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-03 11:08:16 +08:00
lbw
a039dd159c Merge remote-tracking branch 'origin/lei_dev' into leng_dev 2023-03-03 10:47:54 +08:00
aeizzz
606f918cf7 Introducing new features. 优化视频消息和语音消息 2023-03-03 10:36:07 +08:00
aeizzz
83730dec1c Introducing new features. 标签的编辑和删除 2023-03-03 10:00:22 +08:00
32189
dcbddc1fdb Merge remote-tracking branch 'origin/lei_dev' into hui_dev
# Conflicts:
#	src/views/admin/menu/form.vue
2023-03-03 09:47:48 +08:00
lbw
b1441aa045 🔥 删除无用方法导入 2023-03-03 09:47:10 +08:00
lbw
c011886140 feat: 前端对接工作流模块 2023-03-03 09:47:10 +08:00
32189
975adaf104 🎉 排序 2023-03-03 09:42:33 +08:00
32189
5c27bce5ad 🎉 表单校验 2023-03-02 19:34:37 +08:00
aeizzz
392b44264b Introducing new features. 修改账号接入增加复制链接 2023-03-02 18:11:28 +08:00
aeizzz
5daaafdd4d Introducing new features. 优化提示报错问题 2023-03-02 16:48:07 +08:00
aeizzz
d9006c6d6a Introducing new features. 修改微信消息的样式 2023-03-02 16:28:39 +08:00
aeizzz
fdb2526351 ♻️ Refactoring code. 优化代码展示 2023-03-02 14:18:05 +08:00
aeizzz
24f4177d8c ♻️ Refactoring code. 格式化代码 2023-03-02 14:10:13 +08:00
aeizzz
34b00cf7e2 Merge remote-tracking branch 'origin/leng_dev' into lei_dev
# Conflicts:
#	src/views/admin/tenant/form.vue
2023-03-02 13:23:13 +08:00
aeizzz
8d55645309 Introducing new features. 优化微信公众号 2023-03-02 13:20:58 +08:00
lbw
3c0824b0a3 feat: 细节优化 2023-03-02 12:59:11 +08:00
lbw
41949ba4e3 feat: 优化校验规则 2023-03-02 11:27:53 +08:00
aeizzz
7a928715d4 Merge remote-tracking branch 'origin/hui_dev' into mp 2023-03-02 09:39:17 +08:00
aeizzz
8b36ef4247 Introducing new features. 优化微信 2023-03-02 09:38:41 +08:00
lbw
dacf6224ba feat: 底部 footer 可配置 2023-03-02 09:20:06 +08:00
lbw
d4b5be37d3 fix: 用户编辑及删除提示框问题 2023-03-02 09:01:26 +08:00
lbw
d189095274 ♻️ Refactoring code. 优化支付模块代码,调整部分URL 2023-03-01 17:31:20 +08:00
lbw
f77404c700 Introducing new features. 支持支付宝渠道退款接口 2023-03-01 16:12:27 +08:00
aeizzz
8bd1e8061e Introducing new features. 增加微信运营数据分析 2023-03-01 13:41:41 +08:00
aeizzz
0d594b259a Introducing new features. 优化微信公众号 2023-03-01 10:59:34 +08:00
lbw
f2f47e229d Merge remote-tracking branch 'origin/hui_dev' into leng_dev 2023-03-01 10:48:39 +08:00
dh186609
e0c208af1b 🎉 支付渠道样式修改 2023-03-01 10:13:27 +08:00
dh186609
33c58bfb63 🎉 支付订单表单样式修改(订单成功时间字段待定) 2023-03-01 09:48:15 +08:00
dh186609
0ff6b9ed9d 🎉 支付订单,商品订单样式修改 2023-03-01 09:17:06 +08:00
lbw
c0395b6ada Introducing new features. 支持字段变更审计 2023-02-28 20:57:57 +08:00
dh186609
6cf6760c47 🎉 支付渠道样式修改 2023-02-28 16:57:31 +08:00
aeizzz
e38e9bb864 Introducing new features. 删除微信不用的内容,新增微信模块需要的文件上传 2023-02-28 16:31:38 +08:00
dh186609
e5c9706186 🎉 支付订单生成(待处理) 2023-02-28 15:23:34 +08:00
dh186609
7538c12bee 🎉 通知日志,退款订单生成(未处理选择字段) 2023-02-28 14:12:05 +08:00
aeizzz
40974ba570 Introducing new features. 微信模块功能优化 2023-02-28 13:36:57 +08:00
dh186609
f1ad931ddf 🎉 商品订单生成 2023-02-28 10:43:44 +08:00
dh186609
7710f928b5 🎉 支付渠道生成 2023-02-28 09:02:28 +08:00
aeizzz
97fab89ec7 Introducing new features. 回显菜单设置 2023-02-27 21:03:20 +08:00
aeizzz
221904decf Introducing new features. 优化菜单删除 2023-02-27 20:48:26 +08:00
aeizzz
6aa288cdf2 Introducing new features. 微信模块功能优化 2023-02-27 18:34:52 +08:00
dh186609
5343b88faa Merge remote-tracking branch 'origin/leng_dev' into hui_dev 2023-02-27 13:38:49 +08:00
lbw
c98d3c8c5b feat 收银台 2023-02-27 12:10:36 +08:00
dh186609
3f03b101ee Merge remote-tracking branch 'origin/leng_dev' into hui_dev
# Conflicts:
#	src/views/admin/param/index.vue
#	src/views/admin/social/index.vue
#	src/views/daemon/job-manage/index.vue
#	src/views/gen/template/index.vue
2023-02-27 09:18:09 +08:00
aeizzz
30b66bd4fd Introducing new features. 微信菜单设置 2023-02-24 17:47:22 +08:00
lbw
ebe7b7b1f8 🔥 删除无用代码注释 2023-02-24 16:34:22 +08:00
aeizzz
39e61bf929 🐛 Fixing a bug. 新增消息管理和标签管理 2023-02-24 16:01:06 +08:00
dh186609
f3f2eaa270 🎉 遗漏:appmenu表单增加enter事件 2023-02-24 15:04:59 +08:00
dh186609
1cd2aa6a75 🎉 表格增加enter事件 2023-02-24 14:44:57 +08:00
dh186609
243a733a12 🎉 表格增加enter事件 2023-02-24 14:42:21 +08:00
lbw
67838e0d72 🔥 删除无用属性 2023-02-24 14:37:00 +08:00
dh186609
37e4810da8 Merge remote-tracking branch 'origin/lei_dev' into hui_dev
# Conflicts:
#	src/views/admin/menu/form.vue
#	src/views/gen/template/index.vue
2023-02-24 14:26:18 +08:00
lbw
2a6cd2f194 Introducing new features. 支持 enter搜索 2023-02-24 14:24:59 +08:00
lbw
0654cae92f Merge remote-tracking branch 'origin/lei_dev' into leng_dev
# Conflicts:
#	src/views/admin/menu/form.vue
#	src/views/gen/template/index.vue
2023-02-24 14:22:30 +08:00
aeizzz
c4cebf4fe5 🐛 Fixing a bug. 修改微信账号管理和粉丝管理 2023-02-24 14:04:20 +08:00
dh186609
ba72065333 🎉 【字典管理】、【参数管理】同步缓存 2023-02-24 13:59:47 +08:00
dh186609
7131f1ade4 🎉 【字典管理】、【参数管理】同步缓存 2023-02-24 13:59:05 +08:00
aeizzz
5e500600b1 🐛 Fixing a bug. 修复菜单管理新增二级bug 2023-02-24 10:53:43 +08:00
aeizzz
374ba6795f Merge remote-tracking branch 'origin/lei_dev' into mp 2023-02-24 10:39:01 +08:00
aeizzz
6f97ec4b05 Introducing new features. 搜索增加回车自动搜索 2023-02-24 10:13:19 +08:00
dh186609
bf77dacdb2 🎉 是否显示默认显示 2023-02-24 10:02:07 +08:00
aeizzz
e2548091b4 Introducing new features. 页面刷新时新增判断是否跳转到第一页 2023-02-24 09:58:31 +08:00
aeizzz
f161b33270 Introducing new features. 新增 enter 事件 2023-02-24 09:44:35 +08:00
dh186609
e3fceb4375 Merge remote-tracking branch 'origin/leng_dev' into hui_dev 2023-02-24 09:41:35 +08:00
aeizzz
62296e732b Introducing new features. 修改树形选择组件默认加载不显示的节点,修复代码生成器预览左侧的树形组件展示不正确问题 2023-02-24 09:29:50 +08:00
dh186609
d75bac1201 🎉 代码生成风格默认选择第一个 2023-02-24 09:14:45 +08:00
aeizzz
16c91d687c Introducing new features. 新增微信模块 2023-02-24 08:53:30 +08:00
lbw
a0f7c17d76 Reverting changes. 删除 岗位、角色 自动创建 2023-02-23 21:01:10 +08:00
lbw
b8c84a59b6 🔥 删除table id 字段显示 2023-02-23 20:59:11 +08:00
aeizzz
60d376bc9a Introducing new features. 打包开启gzip 2023-02-23 17:27:19 +08:00
aeizzz
df6389ecaa Introducing new features. 新增代码高亮展示 2023-02-23 16:13:16 +08:00
aeizzz
d96dd56586 Merge remote-tracking branch 'origin/leng_dev' into lei_dev 2023-02-23 16:10:34 +08:00
lbw
388dbcf220 🎨 Improving structure / format of the code. 代码格式化 2023-02-23 15:41:40 +08:00
lbw
ea1f3b08b4 Merge remote-tracking branch 'origin/hui_dev' into leng_dev
# Conflicts:
#	src/views/gen/template/index.vue
2023-02-23 15:40:35 +08:00
dh186609
45a8b39fb0 🎉 添加templateCode字段-修改输入框,格式化 2023-02-23 14:47:57 +08:00
dh186609
2234c8d827 🎉 添加templateCode字段 2023-02-23 14:27:10 +08:00
lbw
249264355e 🐛 Fixing a bug. 代码生成分页查询警告 2023-02-23 14:04:10 +08:00
aeizzz
c0127a9d68 Introducing new features. 用户新增如果没有角色和岗位则新增对应的值 2023-02-23 13:40:25 +08:00
dh186609
3ad9168ce7 Merge remote-tracking branch 'origin/lei_dev' into hui_dev
# Conflicts:
#	src/views/gen/group/form.vue
#	src/views/gen/group/index.vue
#	src/views/gen/template/form.vue
#	src/views/gen/template/index.vue
2023-02-23 13:31:37 +08:00
aeizzz
0e804f7efa Introducing new features. 优化代码生成选择模板分组功能 2023-02-23 12:48:44 +08:00
dh186609
58dd466485 格式化 2023-02-23 11:14:56 +08:00
aeizzz
d85ecceac4 Merge remote-tracking branch 'origin/leng_dev' into lei_dev 2023-02-23 11:10:53 +08:00
aeizzz
d425efe841 Introducing new features. 格式化和删除id 2023-02-23 11:09:01 +08:00
dh186609
e1d93749c1 Merge remote-tracking branch 'origin/lei_dev' into hui_dev 2023-02-23 11:03:48 +08:00
aeizzz
fad3e4dd9a Merge remote-tracking branch 'origin/hui_dev' into lei_dev 2023-02-23 10:54:17 +08:00
dh186609
8400deb642 app管理删除bug 2023-02-23 09:44:48 +08:00
dh186609
cef07d5a2f 多余注释 2023-02-23 09:33:08 +08:00
lbw
beadd7c83c Merge remote-tracking branch 'origin/hui_dev' into leng_dev 2023-02-23 09:29:58 +08:00