 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 |
|
|
zjf
|
09da5208ba
|
套餐名移到每日菜谱
|
2026-09-24 16:23:26 +08:00 |
|
|
dzc
|
7f9fac355a
|
11
|
2026-09-24 14:41:13 +08:00 |
|
|
dzc
|
76aa756098
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax
|
2026-09-24 14:34:20 +08:00 |
|
|
dzc
|
357cbaec09
|
feat:咖啡机支付
|
2026-09-24 14:34:13 +08:00 |
|
|
zjf
|
65b35b897b
|
Merge remote-tracking branch 'origin/master'
|
2026-09-23 17:45:36 +08:00 |
|
|
zjf
|
af79592f27
|
优化报表删除
|
2026-09-23 17:45:23 +08:00 |
|
|
dzc
|
30a3a01c70
|
11
|
2026-09-23 13:44:45 +08:00 |
|
|
dzc
|
0f85a87e17
|
feat:咖啡机优化
|
2026-09-23 11:47:19 +08:00 |
|
|
dzc
|
40fb0d2191
|
feat:咖啡机订单优化
|
2026-09-23 10:50:56 +08:00 |
|
|
dzc
|
9d6949a860
|
feat:优化钱包开卡页面
|
2026-09-22 16:40:01 +08:00 |
|
|
dzc
|
7d874a9a47
|
feat:打印机设置
|
2026-09-22 13:18:45 +08:00 |
|
|
dzc
|
54f784c16d
|
feat:打印机使用"套餐名"字段
|
2026-09-22 10:31:44 +08:00 |
|
|
dzc
|
1ffd466ba6
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax
|
2026-09-22 09:35:20 +08:00 |
|
|
dzc
|
ccab8a9de6
|
11
|
2026-09-22 09:35:17 +08:00 |
|
|
zjf
|
7a75aa28ce
|
Merge remote-tracking branch 'origin/master'
|
2026-09-21 14:59:40 +08:00 |
|