Commit Graph
1579 Commits
Author SHA1 Message Date
zjf 4e5e9cee2e 报餐 2026-05-25 18:07:09 +08:00
zjf 45b8e69402 Merge remote-tracking branch 'origin/master' 2026-05-25 17:53:53 +08:00
zjf 1b31b3b94c 报餐 2026-05-25 17:53:38 +08:00
dzc 99c9d0a5b1 feat:优化一下 2026-05-25 17:37:54 +08:00
dzc 931948bd4e feat:微信分付 2026-05-25 17:25:03 +08:00
dzc 2e02b87555 11 2026-05-25 10:43:30 +08:00
dzc e19bc4a7ef feat:发起分账 2026-05-22 18:21:34 +08:00
dzc e00e69ccbb feat:优化云版消费机 2026-05-22 16:46:35 +08:00
dzc 38c24e2ce6 11 2026-05-15 17:49:47 +08:00
dzc 69e3084e45 11 2026-05-13 15:50:51 +08:00
dzc a13adfba87 feat:预定 2026-05-09 17:58:11 +08:00
dzc 8cd122a5d6 feat:菜品分类权限问题 2026-05-09 13:23:53 +08:00
dzc 32cac3558b feat:bug修改 2026-05-09 11:49:21 +08:00
dzc 7d6a670ad5 11 2026-05-08 18:13:28 +08:00
dzc 258cd7a0a3 11 2026-05-08 18:02:03 +08:00
dzc 5026bea928 11 2026-05-08 17:58:31 +08:00
dzc fe8576be42 11 2026-05-08 17:50:41 +08:00
dzc e16fc60d7f fix:配置 2026-05-08 17:31:34 +08:00
dzc 934dfc345d feat:配置 2026-05-08 17:30:53 +08:00
dzc a16f5de2df feat:支付宝支付 2026-05-08 17:21:15 +08:00
dzc 4d3376067c feat:部门管理员查看每日菜单 2026-05-07 15:14:37 +08:00
dzc a059b981ef feat:充值类型列表 2026-05-06 17:38:03 +08:00
dzc f530b7b97d 11 2026-05-02 16:27:19 +08:00
dzc ff3a3258a6 feat:钱包权限 2026-04-30 23:47:56 +08:00
dzc 2bb1d8ad7f fix:配置 2026-04-23 14:59:43 +08:00
dzc 6fb6fa20d4 feat:支付宝支付 2026-04-23 14:52:09 +08:00
dzc d4f45cf37e feat:支付宝支付 2026-04-22 17:37:30 +08:00
dzc 13d912f0cb feat:app第三方支付 2026-04-22 10:37:22 +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 e181483644 Merge remote-tracking branch 'origin/master' 2026-04-13 18:41:14 +08:00
zjf 554ba086a5 订单部分代码 2026-04-13 18:40:41 +08:00
dzc 88f8539990 1 2026-04-13 18:39:32 +08:00
dzc 93334b10a2 feat:bug 2026-04-13 18:13:35 +08:00
dzc 53444853de 11 2026-04-13 17:58:34 +08:00
dzc 4edabb8da5 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-04-13 14:46:58 +08:00
dzc 6d23f2f45f feat:配送费配置 2026-04-13 14:46:54 +08:00
zjf bfa5dc6a26 订单部分代码 2026-04-13 14:23:35 +08:00
zjf 6cdc873a02 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax
# Conflicts:
#	pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java
2026-04-13 05:51:44 +08:00
zjf a1eb855362 预定 2026-04-13 05:51:22 +08:00
dzc 2678568afa feat:我要赚米bug修改 2026-04-10 17:25:28 +08:00
dzc be45e01c55 feat:bug修改 2026-04-10 15:03:21 +08:00
dzc df32a862af Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-04-10 14:37:22 +08:00
dzc 60f3867f7c feat:我要赚米 2026-04-10 14:37:18 +08:00
zjf d23d518629 Merge remote-tracking branch 'origin/master' 2026-04-09 18:20:24 +08:00
zjf 9053894673 菜品必点,骑手接单更新状态 2026-04-09 18:20:03 +08:00
dzc d5ae9d4d9f feat:积分管理 2026-04-09 17:22:41 +08:00
dzc 1ae623ce66 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-04-09 11:54:58 +08:00
dzc 66f407f864 feat:兑换优惠券列表 2026-04-09 11:54:54 +08:00