Commit Graph
1982 Commits
Author SHA1 Message Date
zjf b4e83d5604 酒店 2026-10-12 14:17:22 +08:00
zjf e3e2726f91 Merge remote-tracking branch 'origin/master' 2026-10-10 18:02:15 +08:00
zjf 3b92659e7a 酒店 2026-10-10 18:02:02 +08:00
dzc cc4484c187 feat:云消费机适配青鸟学校 2026-10-10 12:04:32 +08:00
dzc af3736c924 feat:outbox表app消息推送优化 2026-10-09 17:55:27 +08:00
dzc e2a05a6631 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-10-09 17:52:23 +08:00
dzc 1df9c07db3 feat:outbox表app消息推送优化 2026-10-09 17:52:19 +08:00
zjf 3ff7b06f58 Merge remote-tracking branch 'origin/master' 2026-10-09 15:39:37 +08:00
zjf e2ae48d0e5 酒店增加本地维护 2026-10-09 15:39:21 +08:00
dzc 9f289b31a3 fix:修改应为消息内容过长app极光不推送的问题 2026-10-09 14:32:19 +08:00
dzc 96abe868ef feat:消息推送查询
fix:消费机库存显示更改
2026-10-09 13:47:26 +08:00
dzc bf5db4bbb9 feat:钱包流水"显示系统" 2026-10-09 13:01:04 +08:00
dzc b4109f55d2 feat:库存bug 2026-10-09 10:56:52 +08:00
zjf 80b4d1e9cc Merge remote-tracking branch 'origin/master' 2026-10-09 09:35:15 +08:00
zjf 12e71449a8 1.安卓机线下库存效验问题 2.酒店调整 2026-10-09 09:35:05 +08:00
dzc b4fa60a895 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-10-09 09:28:25 +08:00
dzc 65b00be0a4 feat:钱包流水备注 2026-10-09 09:28:21 +08:00
zjf 658b099952 1.每日菜品调整修改 2.酒店调整 2026-10-08 19:09:37 +08:00
zjf 0cb5856d98 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/integration/shangyou/ShangyouCallbackQueueWorker.java
2026-10-08 17:12:26 +08:00
zjf 49ba5cea29 1.每日菜品调整修改 2.酒店调整 2026-10-08 17:11:42 +08:00
dzc 42ac8786ee fix:打包问题 2026-10-08 14:26:58 +08:00
dzc 3a416e2686 11 2026-10-08 13:54:25 +08:00
dzc 675d5552d4 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-10-08 11:48:27 +08:00
dzc 940e457930 feat:迁移hard和wallet模块的定时任务
feat:增加订餐预约时间管理
2026-10-08 11:48:24 +08:00
zjf ffb9a08755 菜品上架下架 2026-10-05 19:53:31 +08:00
zjf 93379302e4 1.列表只出未删除、非回收的单品
2.选择组成菜品弹窗加了分类筛选(可按商户),并带上当前商户
3.酒店增加删除单条,按时间区间删除,清空redis队列
2026-10-05 18:55:15 +08:00
zjf be723cf076 拉取房价 2026-10-01 00:07:09 +08:00
zjf 13dea2f2a4 酒店优化 2026-09-30 23:55:07 +08:00
zjf 8cd0f3bc3d 酒店修复优化 2026-09-30 19:13:59 +08:00
zjf 23b421fbb5 酒店修复优化 2026-09-30 18:49:29 +08:00
zjf 437895891c 酒店修复优化 2026-09-30 18:35:52 +08:00
zjf 9934ec5579 修复优化 2026-09-30 18:21:05 +08:00
zjf 8d62425d68 酒店迁移到超时模块 2026-09-30 11:53:08 +08:00
zjf 9013f51e2a 调整 2026-09-30 11:16:14 +08:00
zjf a3c7699716 酒店 2026-09-29 21:44:58 +08:00
zjf b6f312a364 酒店 2026-09-29 21:18:42 +08:00
zjf 5a13e7d71a Merge remote-tracking branch 'origin/master' 2026-09-28 22:20:25 +08:00
zjf 1845f5865c 1.移除浙政钉诗画代码 2.增加酒店管理 2026-09-28 22:20:09 +08:00
dzc 03e1c65560 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-09-28 16:03:10 +08:00
dzc c5e712f047 feat:订餐查询优化 2026-09-28 16:03:02 +08:00
zjf 33c93c3e18 Merge remote-tracking branch 'origin/master' 2026-09-28 15:29:34 +08:00
zjf 0b9cdbe2ed ai批量插用户订单数据 2026-09-28 15:29:18 +08:00
dzc f2ccd3050a Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-09-28 15:25:51 +08:00
dzc 8b6f20f6bc feat:打印发票修改发票样式
feat:把hard的定时任务迁移到定时任务服务
2026-09-28 15:25:41 +08:00
zjf fe1a7ed9b8 ai批量插用户订单数据 2026-09-28 15:06:29 +08:00
zjf 7d50f45c99 Merge remote-tracking branch 'origin/master' 2026-09-28 15:06:05 +08:00
zjf 645bfa21ad ai批量插用户订单数据 2026-09-28 15:05:45 +08:00
dzc dac1538022 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-09-24 17:34:42 +08:00
dzc 40f3229e01 feat:预约充值
feat:迁移third模块的定时任务到quartz模块
2026-09-24 17:34:36 +08:00
zjf aee1fb1647 Merge remote-tracking branch 'origin/master' 2026-09-24 16:23:41 +08:00