zianxin/biz-pc-cloud-zax
1
0 Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
1,518 Commits 1 Branch 0 Tags
2db730bf46f49e45bab0b5f372c3f05dcfd8c51b
Commit Graph
1434 Commits
Author SHA1 Message Date
zjf 2db730bf46 库存，详情 2026-08-06 22:22:33 +08:00
zjf dc76721cb7 合并冲突 2026-08-04 16:49:48 +08:00
zjf 0e7050daeb Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/views/canteen/canteenSpu/form.vue
 2026-08-04 16:46:24 +08:00
zjf 9b63eff858 菜品列表支持套餐 2026-08-04 16:42:13 +08:00
dzc 04b561bf77 feat:预约菜谱类型 2026-08-04 10:27:46 +08:00
dzc 1477761cad feat:设备日志模块 2026-07-30 13:15:06 +08:00
dzc f9dba0d605 feat:设备日志模块 2026-07-30 13:15:02 +08:00
dzc c89662fc33 fix:食堂菜品预约修改统计 2026-07-29 10:05:51 +08:00
dzc 15ddc7e2ad 11 2026-07-28 21:33:39 +08:00
dzc 1522affb74 feat:优化导入学生 2026-07-28 11:32:52 +08:00
dzc ac82bdb87e feat:订餐人灵活控制 2026-07-22 19:16:07 +08:00
zjf 75be11a38f Merge remote-tracking branch 'origin/master' 2026-07-22 15:05:03 +08:00
zjf ebe5af43ec 加入套餐 2026-07-22 15:04:53 +08:00
dzc 4e8bb9467a feat:加入预约时间模式 2026-07-22 13:42:02 +08:00
dzc 1c54a7bc1e feat:周期餐段 2026-07-21 21:04:31 +08:00
dzc dcf3d2fd6a feat:关系图谱优化 2026-07-20 17:51:14 +08:00
dzc c69e87d1db feat:商户配置-代订餐用户关系 2026-07-20 16:50:24 +08:00
dzc f125d8d1bf feat:后台用户关系绑定 2026-07-20 15:52:06 +08:00
dzc 507bea5469 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud-zax 2026-07-17 17:38:42 +08:00
dzc 9ed91eed18 feat:智能柜日志权限控制 2026-07-17 17:38:38 +08:00
zjf 7d1ba171d1 Merge remote-tracking branch 'origin/master' 2026-07-17 17:31:50 +08:00
zjf bfc604be1c 排餐 2026-07-17 17:31:32 +08:00
dzc 565910a5ca 11 2026-07-17 17:26:52 +08:00
dzc d72ce60a1f 11 2026-07-14 10:17:01 +08:00
dzc eb36a55638 feat:定餐下单，后台增加一个控制，比如控制单次只能一餐，或者可以多选这样的开关 2026-07-07 17:47:55 +08:00
dzc 36cccf30ef feat:极光推送 2026-07-07 17:06:26 +08:00
zjf 802b9a5447 排餐 2026-07-03 10:27:53 +08:00
zjf e0e6c446dd 平台广告 2026-06-30 18:33:27 +08:00
dzc 054096b2ee Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud-zax 2026-06-25 18:27:30 +08:00
dzc 5a99444389 feat：商城支付 2026-06-25 18:27:26 +08:00
zjf 726102c7de 微信登录 2026-06-24 21:14:23 +08:00
zjf 37d73fbeac Merge remote-tracking branch 'origin/master' 2026-06-24 20:51:42 +08:00
zjf 35a0e4f05a 微信登录 2026-06-24 20:51:23 +08:00
dzc b465a1033f feat:商城支付、时间段选择 2026-06-23 19:07:42 +08:00
dzc 715f28092a feat:时间判断 2026-06-22 18:42:36 +08:00
dzc dbce8fb446 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud-zax 2026-06-22 18:32:49 +08:00
dzc 49d555d267 feat:地址管理，时间端选择 2026-06-22 18:32:46 +08:00
zjf f2d8863ec2 Merge remote-tracking branch 'origin/master' 2026-06-22 17:35:54 +08:00
zjf 4b61e0e863 微信登录，密码登录微信二次认证 2026-06-22 17:35:37 +08:00
dzc c003fc819c 11 2026-06-16 18:22:47 +08:00
dzc 99642377d5 11 2026-06-16 18:08:01 +08:00
dzc 305164c91b feat:手动核销 2026-06-16 16:32:56 +08:00
dzc f7d164945f 11 2026-06-16 10:37:14 +08:00
dzc a1360b9756 feat:菜品统计v2 2026-06-16 10:23:58 +08:00
dzc d992857d48 feat:菜品统计 2026-06-16 10:00:04 +08:00
dzc 77ae2c038b feat:夜宵 2026-06-13 13:48:09 +08:00
dzc d3f1b5d7de feat:后台bug 2026-06-12 16:58:09 +08:00
dzc 9bc6c56235 1 2026-06-11 17:36:52 +08:00
dzc 3dfd3f6400 1 2026-06-11 14:18:27 +08:00
dzc e03487a56e Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud-zax 2026-06-11 13:39:34 +08:00