Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 719c2e3969 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud dzc 2025-09-20 10:24:09 +08:00
• 9e837bd0ed 11 dzc 2025-09-20 10:24:04 +08:00
• ca3c0b2a13 零售价字段 zjf 2025-09-19 20:20:36 +08:00
• 2f9c6bd21c Merge remote-tracking branch 'origin/master' zjf 2025-09-18 18:05:38 +08:00
• bf1bfcbfd0 零售退货筛选值 zjf 2025-09-18 18:05:24 +08:00
• 217b5047cd feat:在线商城商品可下架 weiwei 2025-09-18 15:08:50 +08:00
• 72f1a59924 fix:修复金额转换 weiwei 2025-09-17 18:32:27 +08:00
• 6ae3b1e35b fix:修复部分显示问题 weiwei 2025-09-17 16:35:17 +08:00
• 875aac6771 fix:修复在线商城分类图片商品图片显示 weiwei 2025-09-17 10:47:12 +08:00
• 089008ad0e Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud weiwei 2025-09-15 19:40:51 +08:00
• 624344a0bd fix:修复共富商品分类图片上传成功不回显 weiwei 2025-09-15 19:40:45 +08:00
• d5a333f32c 会议桌子摆放形式，会务人员 zjf 2025-09-11 17:07:11 +08:00
• b35b718fa2 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud weiwei 2025-09-08 18:02:09 +08:00
• 9969094ee8 fix:修复共富商城商户图片上传不回显 weiwei 2025-09-08 18:01:59 +08:00
• 766b1f0fc3 Merge remote-tracking branch 'origin/master' zjf 2025-09-08 17:31:40 +08:00
• 1239ac9bd3 金额 zjf 2025-09-08 17:31:26 +08:00
• d3cf827aaa fix:修复充值时选择发票下拉列表项过少 weiwei 2025-09-08 17:22:44 +08:00
• c046422fb9 上架 zjf 2025-09-08 16:20:08 +08:00
• 20dc9d7f91 共富商城 zjf 2025-09-08 15:52:46 +08:00
• cf514a5b1c 共富商城 zjf 2025-09-05 19:32:23 +08:00
• 22ebd0927d 共富商城 zjf 2025-09-04 19:58:06 +08:00
• 153e40bb37 Merge remote-tracking branch 'origin/master' zjf 2025-09-03 19:22:15 +08:00
• 2d9d60cd0a 共富商城 zjf 2025-09-03 19:21:55 +08:00
• d94dcdcac6 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud dzc 2025-09-03 10:03:21 +08:00
• 4a8b77319c feat:硬件扫一扫支付 dzc 2025-09-03 10:03:17 +08:00
• 96184b023f Merge remote-tracking branch 'origin/master' zjf 2025-09-02 18:31:33 +08:00
• 855b187ee5 共富 zjf 2025-09-02 18:31:15 +08:00
• 31ccf613a4 feat:扫一扫的退款(没有购物车的退款) dzc 2025-09-01 15:25:35 +08:00
• 25013139ab Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud dzc 2025-09-01 10:22:39 +08:00
• e2d7044f4e feat:钱包明细 dzc 2025-09-01 10:22:35 +08:00
• 3acd23bc7f Merge remote-tracking branch 'origin/master' zjf 2025-08-29 17:30:11 +08:00
• 2837db2d6b 在线商城增加商品性质 zjf 2025-08-29 17:29:54 +08:00
• 2487ca2431 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud dzc 2025-08-28 19:33:07 +08:00
• 206dbedfd1 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud weiwei 2025-08-28 19:32:43 +08:00
• 6a573364db 1 weiwei 2025-08-28 19:32:11 +08:00
• 925f25e9a6 feat:导出失败的问题 dzc 2025-08-28 19:31:14 +08:00
• b765e84642 feat:商户权限 dzc 2025-08-28 19:21:58 +08:00
• 105679446a feat:退款完成 dzc 2025-08-28 12:41:55 +08:00
• af8e6df1c0 feat:退款完成待测试 dzc 2025-08-27 20:34:11 +08:00
• ca11691c03 feat:购物车商品级退款 dzc 2025-08-27 20:15:28 +08:00
• 8648d8d8a3 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud dzc 2025-08-27 15:58:33 +08:00
• fd65cf1bf3 feat:管理员订单记录分页报错 dzc 2025-08-27 15:58:28 +08:00
• 8b4af2d868 Merge remote-tracking branch 'origin/master' zjf 2025-08-27 15:44:42 +08:00
• 24880bf95c 整理 zjf 2025-08-27 15:44:26 +08:00
• ac657b4698 商品退款,单个退款 dzc 2025-08-27 10:25:36 +08:00
• 361de88372 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud dzc 2025-08-26 19:40:22 +08:00
• d66e3cc2d8 feat:车牌申请 dzc 2025-08-26 19:40:18 +08:00
• 26a948b075 fix:线上点餐字段修改 weiwei 2025-08-26 16:35:32 +08:00
• d99ffbdd2f Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud dzc 2025-08-26 10:31:58 +08:00
• bcdeac390a 11 dzc 2025-08-26 10:31:54 +08:00
• 14f8c93e2c Merge remote-tracking branch 'origin/master' zjf 2025-08-25 22:43:17 +08:00
• ad89129ed2 1 zjf 2025-08-25 22:42:47 +08:00
• e98c4b5825 fix:验证码校验提示文字修改 weiwei 2025-08-25 11:01:22 +08:00
• afb18fcd6d Merge remote-tracking branch 'origin/master' zjf 2025-08-25 10:54:18 +08:00
• c96d92b5dd 切算法验证码 zjf 2025-08-25 10:52:55 +08:00
• 58e6f48738 chore:修改 weiwei 2025-08-22 17:34:32 +08:00
• b1f182a173 feat:每日菜品样式 weiwei 2025-08-21 19:02:12 +08:00
• a68829e953 weiwei 2025-08-21 18:39:34 +08:00
• 7b9ab4ecd0 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud zjf 2025-08-21 17:46:54 +08:00
• 54273cdc9a 1 zjf 2025-08-21 17:45:53 +08:00
• 09ed9cd1a6 fix:修改冲突 weiwei 2025-08-21 17:43:28 +08:00
• 341c6ed83d Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud zjf 2025-08-21 17:36:14 +08:00
• 017cba3a05 库存商品修改 zjf 2025-08-21 17:34:18 +08:00
• 867cabdee8 fix:修复商品未添加口味时id读取错误 weiwei 2025-08-21 17:29:06 +08:00
• 6517d33d1c feat:口味字段和校验修改 weiwei 2025-08-20 18:14:35 +08:00
• ff3a47dcab feat:口味不能重复校验 weiwei 2025-08-20 15:36:08 +08:00
• f39279bf8a feat:库存商品不同口味的库存 weiwei 2025-08-20 11:11:34 +08:00
• 2a82e97cfe feat:库存商品口味 weiwei 2025-08-19 16:46:03 +08:00
• e82a191e37 1.other.ts增加application/octet-stream白名单，增加口味模块代码 zjf 2025-08-19 12:44:37 +08:00
• 2b8a1f0755 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud dzc 2025-08-15 17:28:01 +08:00
• 6c3af87b7b fix:超市购物卡支付、选择钱包、称重商品小数精度不够的问题 dzc 2025-08-15 17:27:57 +08:00
• 766bdea32a fix:相关漏洞修复 weiwei 2025-08-15 15:55:02 +08:00
• 0e66d461a7 fix:入库的实际进价根据数量和总金额变动 weiwei 2025-08-15 11:17:06 +08:00
• ed6e3e61e6 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud weiwei 2025-08-14 17:26:34 +08:00
• 52aa57bf6f fix:入库出库表尾合计；导入每日菜品成功刷新分类 weiwei 2025-08-14 17:26:22 +08:00
• 6225984dd0 Merge remote-tracking branch 'origin/master' zjf 2025-08-14 12:16:33 +08:00
• 8775059d5d 餐桌 zjf 2025-08-14 12:05:10 +08:00
• 6d68dcc8ef Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud dzc 2025-08-14 10:31:56 +08:00
• dd0d6a21cf feat:用户部门 dzc 2025-08-14 10:31:52 +08:00
• 075b4f41bb feat: 入库商品选择弹窗显示规格 weiwei 2025-08-14 09:59:50 +08:00
• 62102ce2f2 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud weiwei 2025-08-14 09:24:39 +08:00
• 26f520ff7c fix: 接口路径修改 weiwei 2025-08-14 09:24:24 +08:00
• 3026bc8eee Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud dzc 2025-08-13 11:46:26 +08:00
• 3df6a10126 feat:订单页面调整 dzc 2025-08-13 11:46:22 +08:00
• 6516b0490b fix: 样式修改 weiwei 2025-08-13 11:30:06 +08:00
• 8a99b52922 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud weiwei 2025-08-12 21:47:06 +08:00
• 2f078911c9 fix: 优化菜单管理 weiwei 2025-08-12 21:46:42 +08:00
• e6460e1fda Merge remote-tracking branch 'origin/master' zjf 2025-08-12 20:38:10 +08:00
• 67d72f9d35 综合服务 zjf 2025-08-12 20:37:54 +08:00
• 5c7b2c7081 fix: 表格分页勾选 weiwei 2025-08-12 19:01:19 +08:00
• 1d5413b5e5 feat: 线上菜品分类的餐段类型 weiwei 2025-08-12 17:45:02 +08:00
• 01fb67fa1b Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud weiwei 2025-08-12 16:59:35 +08:00
• fcf7609a66 feat: 线上预订菜品支持从每日菜品导入 weiwei 2025-08-12 16:57:55 +08:00
• 91c96800b5 Merge remote-tracking branch 'origin/master' zjf 2025-08-12 14:35:45 +08:00
• ad1c767b24 食堂修改 zjf 2025-08-12 14:35:29 +08:00
• ddfc8fe48b fix: 零售退货 weiwei 2025-08-12 09:51:37 +08:00
• 58f66bcf22 fix: 校验提示 weiwei 2025-08-12 09:22:12 +08:00
• 5fd4d6534a Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud zjf 2025-08-11 23:45:47 +08:00
• 8b9f77a848 会议保洁 zjf 2025-08-11 23:45:39 +08:00
• 3a26de1e63 fix: 库存上限和下限都显示精确到小数点 weiwei 2025-08-11 18:02:59 +08:00