Commit Graph
146 Commits
Author SHA1 Message Date
zjf 1b31b3b94c 报餐 2026-05-25 17:53:38 +08:00
dzc 69e3084e45 11 2026-05-13 15:50:51 +08:00
dzc 8cd122a5d6 feat:菜品分类权限问题 2026-05-09 13:23:53 +08:00
dzc 4d3376067c feat:部门管理员查看每日菜单 2026-05-07 15:14:37 +08:00
zjf 3aac5ab513 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	pjcloud-canteen/pjcloud-canteen-biz/src/test/java/com/bsd/pjcloud/canteen/controller/CanteenDeliveryOrderControllerTest.java
2026-04-15 17:23:39 +08:00
zjf 371c012498 商家外卖订单 2026-04-15 17:22:08 +08:00
dzc a43fae5636 11 2026-04-13 18:44:34 +08:00
zjf 554ba086a5 订单部分代码 2026-04-13 18:40:41 +08:00
zjf a1eb855362 预定 2026-04-13 05:51:22 +08:00
zjf 9053894673 菜品必点,骑手接单更新状态 2026-04-09 18:20:03 +08:00
zjf 09b880ed8a 骑手配送 2026-04-08 17:37:11 +08:00
zjf 5a079154cf 移动端收货地址 2026-04-02 17:10:40 +08:00
zjf 4af4e7f516 添加部门是否是单位字段,新增移动端app商家管理app接口 2026-04-01 20:20:16 +08:00
zjf d16cbdc395 楼栋完善 2026-03-31 18:30:46 +08:00
zjf de216a3582 菜品转换统计 2026-03-11 18:49:24 +08:00
zjf 687906f16c 1 2025-08-14 15:09:52 +08:00
zjf 72e23fbdbe 在线订餐默认当前日期 2025-08-14 11:29:43 +08:00
dzc 307b332e4a 11 2025-08-13 21:13:20 +08:00
zjf 77dedf29f2 菜品预定 2025-08-13 18:26:00 +08:00
zjf 9e09738b26 Merge remote-tracking branch 'origin/master' 2025-08-13 15:42:57 +08:00
zjf b5aa55ca99 包厢改餐桌 2025-08-13 15:42:37 +08:00
dzc 75033aa225 feat:app统计 2025-08-13 11:47:08 +08:00
zjf 94e6a9428d 食堂预定 2025-08-12 15:11:00 +08:00
zjf b432b80324 食堂修改 2025-08-12 14:35:53 +08:00
zjf 75656cd8b1 fix(智慧超市):入库数量统一修改为double类型,商品选择vo增加商品性质字段 2025-08-04 12:24:08 +08:00
zjf dd983527f3 Merge branch 'master' into pjfk
# Conflicts:
#	pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java
#	pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
2025-07-09 12:28:26 +08:00
zjf 8f554e933c 会议后台接口 2025-07-04 19:54:22 +08:00
zjf 52207b0fee 包厢修复 2025-05-28 14:29:54 +08:00
zjf 4d4dfaf7e9 食材进销 2025-05-28 14:05:53 +08:00
zjf 01095ce445 食材进销分类 2025-05-28 12:56:34 +08:00
zjf ebbb5cc97e 食材进销分类 2025-05-28 11:38:33 +08:00
zjf e8725d0f98 修复超市erp,添加自动计算成本价,修复食堂进销编辑保存 2025-05-23 16:49:55 +08:00
zjf 623e68743e 食堂erp修复编辑实际进价 2025-05-23 12:28:46 +08:00
zjf 3825fe999e 食堂erp修复 2025-05-23 11:27:59 +08:00
zjf 9fe173745e 食堂erp修复 2025-05-23 10:54:28 +08:00
zjf 02eb6dd002 食堂erp修复 2025-05-23 10:44:26 +08:00
zjf ade3249661 食堂erp修复 2025-05-23 10:12:46 +08:00
zjf b9d6d0b0e1 食堂erp修复 2025-05-23 10:10:58 +08:00
zjf 503cf757da 食堂erp修复 2025-05-23 09:41:40 +08:00
zjf 4094db8934 食堂erp修复 2025-05-22 23:22:04 +08:00
zjf 8198bd7484 会议 2025-05-22 22:22:47 +08:00
zjf e1f343c2b4 菜品库存 2025-05-16 16:10:05 +08:00
zjf 89d7f13e4d 菜品库存 2025-05-16 11:57:44 +08:00
zjf 43e25fac68 1 2025-05-15 19:12:46 +08:00
zjf 0ff90611b7 食堂进销 2025-05-15 15:12:56 +08:00
zjf 0e1dd61681 食堂进销 2025-05-14 19:25:24 +08:00
zjf 1492d6053e 食堂进销 2025-05-14 10:07:07 +08:00
zjf b6aed9f9d2 食堂进销 2025-05-13 21:50:36 +08:00
zjf 0bfcab00fe 食堂进销 2025-05-13 12:44:04 +08:00
zjf 8e4752fd6d 食堂进销 2025-05-13 09:59:40 +08:00