Commit Graph
101 Commits
Author SHA1 Message Date
zjf 41d4439efe 整理 2025-01-08 17:03:42 +08:00
ctw ad895f0b3e Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-08 11:02:23 +08:00
ctw 7059d55377 商品分类下拉选择 2025-01-08 11:02:16 +08:00
dzc ce253b22ee 1111111 2025-01-08 11:00:54 +08:00
ctw 75750cea2f Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-07 18:25:40 +08:00
ctw 79497d7b05 商户下拉选择 2025-01-07 18:25:20 +08:00
dzc d940000ef0 feat:充值、消费、退款记录 2025-01-07 18:22:21 +08:00
dzc 301c290a42 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud
# Conflicts:
#	.env.development
2025-01-07 17:40:51 +08:00
dzc 79be4b989d feat:售后订单代码生成 2025-01-07 17:40:38 +08:00
ctw 5da50dbc19 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-07 17:04:44 +08:00
ctw 96d803a6db 样式优化 2025-01-07 17:03:45 +08:00
dzc d547d8eef8 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-07 16:09:15 +08:00
dzc 48b5ad63d4 feat:二维码列表 2025-01-07 16:09:12 +08:00
zjf 3bd0644d3b Merge remote-tracking branch 'origin/master' 2025-01-07 15:21:53 +08:00
zjf f0c6056e57 整理 2025-01-07 15:21:38 +08:00
ctw 8aeed03d5c 线上点餐-菜品分类-新增,添加商户选项 2025-01-07 14:55:06 +08:00
ctw a8c78d19dd 线上点餐-菜品列表-新增,修改商户选项 2025-01-07 14:49:04 +08:00
ctw d3c596528d Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-07 14:39:12 +08:00
ctw ffeb7e71b7 每日菜谱->菜品列表->新增,添加商户选项 2025-01-07 14:38:39 +08:00
zjf 965ed6f250 整理 2025-01-07 14:31:58 +08:00
zjf 7af77692f6 Merge remote-tracking branch 'origin/master' 2025-01-07 14:24:36 +08:00
zjf d9e5d86a68 整理 2025-01-07 14:24:16 +08:00
ctw f7ba21ac8f 修改货商下拉选择器 2025-01-07 13:06:47 +08:00
ctw 1aad7880f0 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-07 10:55:27 +08:00
ctw 3e0b0bbe8f 商品管理基础信息必填项未填写完整显示消息提示 2025-01-07 10:55:22 +08:00
zjf f6ecec24b1 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-07 10:47:22 +08:00
zjf d744b188d0 注释字段 2025-01-07 10:47:13 +08:00
ctw 45dc845d09 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-07 10:45:20 +08:00
ctw cdf99bcf94 修改商品管理接口,添加部分表单字段 2025-01-07 10:45:15 +08:00
dzc 6d4b1799ed feat:其他设置 2025-01-06 16:27:00 +08:00
dzc 3f3020bc13 feat:支付配置 2025-01-06 11:35:02 +08:00
dzc f618439e06 feat:订单代码生成 2025-01-05 17:05:38 +08:00
dzc 528c82bcf0 mq、sdk设置 2025-01-05 16:35:02 +08:00
dzc c07351caea creat:硬件列表 2025-01-05 15:49:36 +08:00
dzc a0c7e31564 feat:发票管理、设备列表代码生成 2025-01-05 14:40:23 +08:00
dzc 0e96baace1 feat:充值配置-套餐 2025-01-03 19:54:53 +08:00
dzc 59aee8fa1a creaet:饭卡冻结记录 2025-01-03 18:13:09 +08:00
dzc 20e0b20867 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-03 16:19:40 +08:00
dzc 08b193fe7b creat:生成code 2025-01-03 16:19:36 +08:00
zjf d810984d32 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud
# Conflicts:
#	src/views/supermarket/supermarketSpu/form.vue
2025-01-03 12:54:45 +08:00
ctw 4fd45490d3 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-03 11:49:09 +08:00
ctw c444bc8607 包装单位和辅助条码添加校验 2025-01-03 11:49:03 +08:00
zjf 9ce0139f53 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-03 10:02:06 +08:00
dzc 18fa9d18a4 feat:跨单位、外来人员代码生成 2025-01-02 16:57:19 +08:00
dzc 1c6e1ff748 create:钱包开卡完成 2025-01-02 15:48:07 +08:00
zjf 8b374508ef Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud
# Conflicts:
#	.env.development
2025-01-02 15:46:52 +08:00
zjf 6a8598cd9f 超 2025-01-02 15:46:10 +08:00
dzc 360602eaf8 feat:选择部门组件 2025-01-02 10:56:40 +08:00
dzc cc9090de11 feat:选择商户组件 2025-01-02 10:26:32 +08:00
dzc 8624e81f6d Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2024-12-31 19:05:51 +08:00