Commit Graph

1248 Commits

Author SHA1 Message Date
YunaiV
ac7f1e29fb Merge branch 'dev_tmp' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-04 10:50:04 +08:00
芋道源码
71e6d51c12
!299 update src/layout/components/Message/src/Message.vue.
Merge pull request !299 from lzy/N/A
2023-11-04 02:44:57 +00:00
YunaiV
f79d31a64a code review:满减送活动 2023-11-04 10:39:39 +08:00
芋道源码
27defa7268
!291 满减页面布局
Merge pull request !291 from Bluemark/mall-backed
2023-11-04 02:30:50 +00:00
YunaiV
a9faeb1bdb code review:客户管理 2023-11-04 10:12:40 +08:00
芋道源码
09c44cd4fe
!306 feat: 客户详情 + review 修改
Merge pull request !306 from wanwan/dev
2023-11-04 01:50:33 +00:00
Wanwan
23f483ac45 feat: 客户详情 + review 修改 2023-11-04 03:21:01 +08:00
liuhongfeng
8ef5227f88 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-04 00:48:51 +08:00
芋道源码
f6adb4ebaf
!303 商城装修
Merge pull request !303 from 疯狂的世界/dev
2023-11-03 15:07:04 +00:00
jason
fcc748dc63 Merge remote-tracking branch 'origin/dev' into dev 2023-11-03 08:47:57 +08:00
jason
753f5de81e 转账 - 新增转账订单查询 2023-11-03 08:46:53 +08:00
owen
3c0f3ceed5 营销:装修模板,底部导航适配APP 2023-11-03 06:47:46 +08:00
风狗
bf418653e4
update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
地区选择框placeholder 修改

Signed-off-by: 风狗 <909275705@qq.com>
2023-11-02 02:08:26 +00:00
liuhongfeng
3d54ad3a6a 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-31 23:32:35 +08:00
owen
9bd33355e2 营销:装修编辑器样式优化 2023-10-31 17:17:46 +08:00
dongshanshan
18e2c33cef Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-10-31 16:53:48 +08:00
dongshanshan
9a3253ad20 feat: 会员商品收藏 2023-10-31 16:53:44 +08:00
owen
881c4f3a29 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断
2023-10-31 16:01:22 +08:00
xingyu
10483577b7 fix: types 2023-10-31 14:26:17 +08:00
xingyu
52755b38a9 fix: props 2023-10-31 14:25:49 +08:00
xingyu
4365ca6177 fix: title name 2023-10-31 14:10:05 +08:00
xingyu
ce93c8d4e9 fix: name warn 2023-10-31 14:04:43 +08:00
xingyu
7321ff2136 chore: wh-full 2023-10-31 10:20:39 +08:00
xingyu
af7c6f3b2c fix: url error 2023-10-31 10:17:00 +08:00
xingyu
80e72fd924 feat: coding 2023-10-31 10:13:22 +08:00
xingyu
2a029ba35b feat: add useTagsView hooks 2023-10-31 10:12:04 +08:00
xingyu
57e8256e9a feat: add useNow hooks 2023-10-31 10:11:55 +08:00
xingyu
bdcef303ff perf: useValidator hooks 2023-10-31 10:11:43 +08:00
xingyu
f8fdebffe6 feat: add useNetwork hooks 2023-10-31 10:11:34 +08:00
xingyu
4ba264e00d perf: use driver.js 2023-10-31 10:07:21 +08:00
xingyu
f26a4cae10 feat: unocss add shortcuts 2023-10-31 10:04:31 +08:00
liuhongfeng
2b84de7e09 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-30 21:32:50 +08:00
lzy
c269cab6b2
update src/layout/components/Message/src/Message.vue.
fix:  处理站内信内容过多回显问题

Signed-off-by: lzy <7783739+lzyyd@user.noreply.gitee.com>
2023-10-30 06:20:16 +00:00
jason
c1534bf168 Merge remote-tracking branch 'origin/dev' into dev 2023-10-29 23:48:20 +08:00
jason
55a961e862 转账 - 管理后台新增转账示例 2023-10-29 23:48:10 +08:00
YunaiV
0c81a0d96a code review:客户表的实现 2023-10-29 22:29:03 +08:00
owen
e9ff8d3237 商城装修 2023-10-29 22:03:24 +08:00
YunaiV
dc5cf9f24c code review:客户表的实现 2023-10-29 17:55:39 +08:00
YunaiV
690b208a4e Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-10-29 10:38:48 +08:00
Wanwan
60d53126c4 feat: 调整客户表的字段 2023-10-29 00:33:38 +08:00
Wanwan
59cf0c29f0 feat: 调整客户表的字段 2023-10-29 00:03:11 +08:00
Wanwan
4cdab6fb3e feat: 调整客户表的字段 2023-10-28 19:50:42 +08:00
芋道源码
cca34e0acb
!295 订单:解决列数据中的 table#header 数据不刷新的问题
Merge pull request !295 from puhui999/dev-to-dev
2023-10-27 15:03:42 +00:00
YunaiV
b9ab22dad1 code review:客户表的实现 2023-10-27 23:01:00 +08:00
芋道源码
32b3c874f5
!294 feat: 客户表的 crud
Merge pull request !294 from wanwan/master
2023-10-27 14:41:47 +00:00
puhui999
a624db04e9 三方应用新增授权方的网页应用 agentId 属性 2023-10-26 17:00:13 +08:00
puhui999
88a22d90e5 解决钉钉绑定失败的问题 2023-10-26 16:19:22 +08:00
puhui999
6ee2492ff1 新增社交用户 RUD 2023-10-25 17:02:11 +08:00
puhui999
8935188a82 新增社交客户端 CRUD 2023-10-25 16:07:58 +08:00
puhui999
d060d27ab2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-25 11:14:26 +08:00
puhui999
ca385bc08e 解决列数据中的 table#header 数据不刷新的问题 2023-10-25 11:14:00 +08:00
xingyu
238537df83 fix: ElLoading need import 2023-10-25 10:36:06 +08:00
Wanwan
044754cdb4 feat: 客户表的 crud 2023-10-25 00:24:20 +08:00
YunaiV
539352f598 修复 banner 返回字段不对 2023-10-24 20:29:23 +08:00
YunaiV
6644a4d4a6 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-10-24 20:12:39 +08:00
YunaiV
e5d6a9dae1 code review:banner 逻辑 2023-10-24 20:07:48 +08:00
puhui999
95d7d1eb42 优惠卷模版样式调整 2023-10-24 17:39:02 +08:00
puhui999
75135e1e4f 商品 spu 脱离优惠卷模块 2023-10-24 16:57:20 +08:00
puhui999
a7439ee08b 完善 banner 管理 2023-10-24 16:10:55 +08:00
KONGDY-PC\Kongdy
7c8f7d570f 满减页面布局 2023-10-23 10:37:39 +08:00
芋道源码
54cce467ab
!286 feat: crm 线索表完善 review 提到的问题
Merge pull request !286 from wanwan/master
2023-10-21 13:58:13 +00:00
YunaiV
6c6c2cb058 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-10-21 21:56:41 +08:00
芋道源码
af79d4a653
!285 【新增】回款管理 功能
Merge pull request !285 from souvc/master
2023-10-21 13:56:12 +00:00
芋道源码
73578ce8b2
!290 【工作流】--加签减签review修改接口地址
Merge pull request !290 from Youkehai/feature/addSignAndSubSign
2023-10-21 13:06:19 +00:00
YunaiV
2dbfa77bee code review:banner 逻辑 2023-10-21 19:59:41 +08:00
芋道源码
4709c18a6e
!284 完善 SPU,订单列表:完善表头宽度自适应
Merge pull request !284 from puhui999/dev-to-dev
2023-10-21 11:08:44 +00:00
芋道源码
929fa9a208
!289 满减页面布局
Merge pull request !289 from 落日晚风/master
2023-10-21 11:05:51 +00:00
YunaiV
423ea319e0 code review:限时折扣 2023-10-21 18:18:40 +08:00
kehaiyou
5cfb67d047 fix: 【工作流】--加签减签review修改接口地址 2023-10-21 18:16:39 +08:00
jason
bb5945958b 钱包 - 优化
支付应用 - 证书模式增加应用私钥
2023-10-21 15:33:31 +08:00
芋道源码
e187c55408
!283 mall模块
Merge pull request !283 from zxiaoxiu/discount
2023-10-21 06:23:04 +00:00
puhui999
491b3a5018 新增 banner 管理 2023-10-21 02:40:20 +08:00
913752709@qq.com
fb90a85e43 feat: crm 线索表完善 review 提到的问题 2023-10-21 00:53:32 +08:00
liuhongfeng
26780c3525 【新增】回款计划 功能 2023-10-20 23:48:39 +08:00
liuhongfeng
7ad1457f79 【新增】回款管理 功能 2023-10-20 22:17:05 +08:00
puhui999
0730e215d8 完善文章管理 review 提到的问题 2023-10-20 22:16:18 +08:00
zhangshuai
9f77514c17 限时折扣 2023-10-20 20:51:18 +08:00
puhui999
d62bbcdd92 Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
#	package.json
#	src/views/member/user/detail/UserOrderList.vue
2023-10-20 16:40:19 +08:00
puhui999
1e8945de63 SPU: 新增完善活动优先级拖拽排序 2023-10-20 16:36:50 +08:00
puhui999
01d78429cc SPU: 完善优惠卷选择 2023-10-20 15:35:01 +08:00
puhui999
18df708b49 SPU: 完善优惠卷选择 2023-10-20 11:48:59 +08:00
YunaiV
2457665b55 code review:门店自提 2023-10-20 09:46:15 +08:00
芋道源码
826199dc22
!281 fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx
Merge pull request !281 from 陈晨成/master
2023-10-19 16:25:00 +00:00
1351515658@qq.com
3074adb1df fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx 2023-10-19 18:43:02 +08:00
puhui999
3464bb9c74 SPU: 新增优惠卷选择 2023-10-19 17:33:42 +08:00
puhui999
5b3bcecef2 OrderTableColumn: 商品信息列样式调整2 2023-10-19 15:54:23 +08:00
puhui999
094f8e16db OrderTableColumn: 商品信息列样式调整 2023-10-19 11:10:33 +08:00
puhui999
70778fd9e6 UserOrderList 重构完善 2023-10-19 10:54:10 +08:00
puhui999
5270c83876 订单列表:完善表头宽度自适应 2023-10-19 10:36:52 +08:00
913752709@qq.com
7af2a3bcc3 feat: CRM 线索表 crud 2023-10-18 20:02:59 +08:00
puhui999
04d88ce1a6 订单列表:自定义列抽离封装为组件 2023-10-18 17:20:13 +08:00
puhui999
d1a3fe5d5a 营销文章:新增表单属性移除浏览量 2023-10-18 11:33:42 +08:00
owen
ff01effd45 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 23:26:08 +08:00
owen
431fff28ce 统计卡片修改为全局组件 2023-10-17 23:25:49 +08:00
owen
61b3bdfd4c 交易:核销订单 2023-10-17 23:18:07 +08:00
芋道源码
d6b0305d78
!277 修复前端支付渠道配置权限
Merge pull request !277 from 小玩家/master
2023-10-17 14:55:14 +00:00
YunaiV
8832eafaae code review:crm 合同流程 2023-10-17 22:52:24 +08:00
1163996518@qq.com
533b4e5006 支付渠道配置--修复权限 2023-10-17 21:27:13 +08:00
1163996518@qq.com
d5328918ab 支付渠道配置--修复权限 2023-10-17 20:58:28 +08:00
芋道源码
40ec1b08ae
!275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
2023-10-17 12:52:28 +00:00
芋道源码
0089d59d36
!274 CRM/合同管理 CRUD初稿
Merge pull request !274 from dhb52/master
2023-10-17 12:01:51 +00:00
YunaiV
c27685285a code review:修复工作流的审批界面报错问题 2023-10-17 19:50:09 +08:00
YunaiV
63fd52828c Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 19:03:02 +08:00
YunaiV
aa99c53729 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/mall/statistics/member/index.vue
2023-10-17 19:02:37 +08:00
芋道源码
0242c84196
!267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
2023-10-17 11:01:18 +00:00
owen
57f6367596 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 16:09:55 +08:00
owen
6fc232b758 交易:订单核销 2023-10-17 16:09:36 +08:00
dhb52
dced551698 feat: CRM/合同 crud 2023-10-16 23:56:34 +08:00
jason
c3f06f5fbe 钱包 - 钱包余额流水 2023-10-16 22:45:32 +08:00
jason
8626bccc4c 钱包 - 钱包余额流水 2023-10-16 22:32:10 +08:00
jason
ae2c3f2ad5 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 22:27:39 +08:00
owen
e3a0cfe5e9 统计:修复错误 2023-10-16 22:18:51 +08:00
owen
6204ce6c1b 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 2023-10-16 22:09:20 +08:00
owen
cd4b4cd322 统计:Review修改 2023-10-16 22:03:36 +08:00
YunaiV
66ec610801 code review:文章管理 2023-10-16 21:55:11 +08:00
xingyu
8c18ad941e perf: is utils 2023-10-16 15:09:47 +08:00
xingyu
5da9b660bd perf: propTypes 2023-10-16 15:09:13 +08:00
xingyu
1a1b70a350 style: stylelint 2023-10-16 15:04:05 +08:00
owen
edfd03903f 统计:会员终端统计,处理未知终端情况 2023-10-16 14:26:04 +08:00
owen
2bfc9c3b13 统计:处理会员性别统计,存在未知的情况 2023-10-16 13:25:15 +08:00
owen
661e72bcfd 统计:修复错误 2023-10-16 13:15:17 +08:00
owen
8dec8edc6a Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 13:01:02 +08:00
owen
e1a72779d4 统计:Review修改 2023-10-16 13:00:13 +08:00
YunaiV
99172ea088 code review:文章管理 2023-10-16 09:57:46 +08:00
owen
195309dbb6 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 09:52:35 +08:00
owen
3802fee661 商城:增加商城首页 2023-10-16 09:51:19 +08:00
YunaiV
e2a08ddbac 恢复 SSO 界面的路由 2023-10-15 21:58:19 +08:00
jason
90d6f4da9f 钱包- 钱包余额查询 2023-10-15 17:47:36 +08:00
puhui999
50e43e4028 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-15 16:14:32 +08:00
puhui999
befffb3f7d 营销活动:新增文章管理。 2023-10-15 16:14:09 +08:00
dhb52
89417ac393 fix: 删除SSOLogin.vue组建,解决登录界面不停重定向问题 2023-10-15 14:58:13 +08:00
dhb52
3587d1ef97 fix: 路由缺少name字段,ts不高兴 2023-10-15 14:29:16 +08:00
dhb52
4d77d7e136 feat: 社交平台登录 2023-10-15 14:26:20 +08:00
puhui999
36bb90fbb8 营销活动:新增文章分类管理 2023-10-15 00:54:28 +08:00
芋道源码
889334bc37
!266 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Merge pull request !266 from 风狗/N/A
2023-10-14 10:19:37 +00:00
芋道源码
b57b45c96f
!255 站内信测试增加 Member 用户类型支持
Merge pull request !255 from 风狗/dev
2023-10-14 10:18:54 +00:00
芋道源码
fa71f85221
!265 修复,刷新菜单缓存失效问题
Merge pull request !265 from 天痕/N/A
2023-10-14 10:15:13 +00:00
jason
f9d0c1aa1c 钱包-充值套餐 2023-10-14 11:32:54 +08:00
xingyu
e04ca7aac7 fix: unocss eslint 2023-10-13 10:34:01 +08:00
芋道源码
6ed7b3a69e
!270 合并商城最新代码
Merge pull request !270 from 芋道源码/dev
2023-10-12 13:53:25 +00:00
芋道源码
532b237712
!268 统计:会员统计
Merge pull request !268 from 疯狂的世界/dev
2023-10-11 04:34:07 +00:00
YunaiV
855b37c1ab code review:拼团记录列表 2023-10-11 11:04:03 +08:00
puhui999
b08e0e5ab2 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:55:53 +08:00
puhui999
3500a20630 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:53:22 +08:00
youkehai
62a953815d fix: 减签按钮显示和api地址修改 2023-10-10 10:40:30 +08:00
owen
6b7040404e 统计:会员统计 2023-10-09 23:27:32 +08:00
owen
d4a521eff1 统计:交易统计Review修改 2023-10-09 23:27:32 +08:00
kehaiyou
683e319c72 fix: 【工作流】--加签减签 2023-10-08 22:35:50 +08:00
风狗
aa5f27bec7
修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Signed-off-by: 风狗 <909275705@qq.com>
2023-10-08 08:26:07 +00:00
YunaiV
86323f970b code review:拼团记录列表 2023-10-08 07:30:14 +08:00
天痕
fff4cfd012
修复,刷新菜单缓存失效问题
Signed-off-by: 天痕 <614891294@qq.com>
2023-10-07 10:51:56 +00:00
puhui999
5b4983a3e9 拼团记录:优化页面布局,添加日期快捷选项 2023-10-07 11:10:26 +08:00
puhui999
8c347e5990 拼团活动:表单添加虚拟成团控制按钮 2023-10-07 10:04:05 +08:00
puhui999
e86dfa30fd Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-06 22:21:10 +08:00
puhui999
c445173855 拼团记录:接口对接 2023-10-06 22:20:40 +08:00
YunaiV
24fc36e23a promotion:调整拼团活动的界面 2023-10-06 21:03:17 +08:00
puhui999
eee3d0fef5 拼团记录: 完成 UI 部分 2023-10-06 18:40:21 +08:00
YunaiV
78062dd474 promotion:调整拼团活动的界面 2023-10-06 10:58:31 +08:00
puhui999
869bac2501 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-05 21:50:33 +08:00
YunaiV
cf7ac2cb10 promotion:新增记录记录列表 2023-10-05 12:42:00 +08:00
YunaiV
860872a890 promotion:新增砍价记录列表 2023-10-05 12:06:57 +08:00
YunaiV
42f0bf07f0 promotion:优化砍价活动的管理 2023-10-05 02:17:44 +08:00
owen
58b6b1ba57 交易:核销 2023-10-04 10:51:35 +08:00
YunaiV
7c491ff62a promotion:优化秒杀活动的界面 2023-10-03 18:41:57 +08:00
YunaiV
40f44fc78e promotion:优化优惠劵的界面 2023-10-03 13:01:31 +08:00
YunaiV
59ab6218ca trade:优化分销界面的 width 列宽度,和一些非空判断 2023-10-03 12:16:24 +08:00
芋道源码
04a94ad941
!254 解决处理顶级非目录路由的组件名称逻辑缺失的问题
Merge pull request !254 from clockdotnet/master_pr
2023-10-03 02:27:37 +00:00
owen
a06a63c1be Merge remote-tracking branch 'origin/dev' into dev 2023-10-02 23:52:23 +08:00
YunaiV
ab95d87c68 trade:优化门店的 list 列表,新增是否自提的配置项 2023-10-02 21:18:31 +08:00
YunaiV
a9bbbc7b0a trade:优化运费模版的实现 2023-10-02 18:30:22 +08:00
YunaiV
bb08f6f54f trade:完善退款详情 2023-10-02 15:44:26 +08:00
owen
df8a3941c1 对齐面包屑的图标和文字 2023-10-02 11:11:07 +08:00
YunaiV
4fddbccea1 trade:完善订单详情 2023-10-02 10:34:37 +08:00
YunaiV
588ce1c9ae trade:微调 order 列表界面 2023-10-01 23:44:38 +08:00
芋道源码
a5808c9e9c
!259 Review代码修改
Merge pull request !259 from 疯狂的世界/dev
2023-10-01 13:57:56 +00:00
YunaiV
17c31978f7 product:优化商品评论 2023-10-01 21:23:50 +08:00
YunaiV
8b7543acd5 product:优化属性列表 2023-10-01 21:11:47 +08:00
YunaiV
5f80d1611c product:优化分类列表 2023-10-01 20:55:51 +08:00
YunaiV
88677ee121 product:优化商品发布页 2023-10-01 20:16:02 +08:00
YunaiV
3a9668d632 product:优化商品列表的样式、实现代码 2023-10-01 19:44:13 +08:00
owen
3a96812d47 会员:会员配置的积分相关字段加上point前缀 2023-10-01 10:41:20 +08:00
owen
3ab1ed707f 会员:积分配置改为会员配置 2023-10-01 10:25:18 +08:00
owen
0066d79876 签到:签到后增加用户积分、经验 2023-10-01 09:53:52 +08:00
owen
4b7e57e67d 会员详情,修改会员积分 2023-09-30 15:50:12 +08:00
owen
940a102546 会员:会员详情-推广用户列表 2023-09-30 14:10:15 +08:00
owen
b48f19c646 会员:会员详情-优惠券列表 2023-09-30 13:55:42 +08:00
owen
675f3df5cb 会员详情,查询钱包信息 2023-09-30 12:40:21 +08:00
owen
6475f81534 Merge remote-tracking branch 'origin/dev' into dev 2023-09-29 21:08:48 +08:00
owen
c322fb3d0d 统计:交易统计 2023-09-29 21:08:14 +08:00
owen
150c77cff0 fix eslint problems 2023-09-29 16:25:38 +08:00
YunaiV
fb94ae9674 trade:退款理由的维护 2023-09-29 13:35:52 +08:00
YunaiV
04e02ffbd2 trade:分佣界面的微调 2023-09-28 16:38:51 +08:00
YunaiV
74de8e9687 trade:优化交易配置的参数校验 2023-09-28 15:29:15 +08:00
YunaiV
2f82eff526 Merge remote-tracking branch 'origin/dev' into dev 2023-09-27 23:30:48 +08:00
YunaiV
888c1371c6 Merge remote-tracking branch 'origin/master' 2023-09-27 23:30:16 +08:00
YunaiV
c6031ba2b2 增加 user detail 的 todo 2023-09-27 23:30:09 +08:00
绮梦
f832d26a0d 站内信测试增加 Member 用户类型支持 2023-09-25 16:04:32 +08:00
shizhong
361e4fadda 解决处理顶级非目录路由的组件名称逻辑缺失的问题 2023-09-25 15:25:33 +08:00
youkehai
0fba0d9a6a feat: 对齐后端-工作流委派的参数 2023-09-25 11:31:13 +08:00
youkehai
2aeba127b6 Merge remote-tracking branch 'upstream/master' into feature/bpm-delegate
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-25 09:37:22 +08:00