 sxu
|
999c07938c
|
订单评价
|
2025-05-05 12:53:35 +08:00 |
|
sxu
|
057d0da2fa
|
订单评价
|
2025-05-05 12:52:02 +08:00 |
|
sxu
|
ff60ccd255
|
订单评价
|
2025-05-05 12:43:27 +08:00 |
|
sxu
|
7e1e9795e6
|
bug 5841
|
2025-05-05 11:50:55 +08:00 |
|
sxu
|
b96f1e0098
|
bug 5841
|
2025-05-05 11:47:09 +08:00 |
|
sxu
|
8322745260
|
区域含食堂不能删
|
2025-05-05 11:32:05 +08:00 |
|
sxu
|
4873c9107b
|
食堂含档口不能删
|
2025-05-05 11:22:18 +08:00 |
 jjLv
|
1050a759d4
|
双屏消费机参数配置修改、查询接口
|
2025-04-30 17:17:54 +08:00 |
 liux
|
796a91fa5d
|
h5历史菜谱功能薪增
|
2025-04-30 14:08:11 +08:00 |
gaowdong
|
5d1ca83851
|
增减钱包余额保护
|
2025-04-30 09:34:54 +08:00 |
|
gaowdong
|
96b57d76ae
|
bug
|
2025-04-29 15:34:29 +08:00 |
|
liux
|
7df00e5adc
|
Merge remote-tracking branch 'origin/master'
|
2025-04-29 14:34:15 +08:00 |
|
liux
|
1895152fd4
|
bug修复
|
2025-04-29 14:33:59 +08:00 |
|
gaowdong
|
44ac8ecb88
|
bug
|
2025-04-29 14:32:58 +08:00 |
|
sxu
|
36556300a4
|
Merge remote-tracking branch 'origin/master'
|
2025-04-29 11:07:32 +08:00 |
|
sxu
|
be09234259
|
bug 5801
|
2025-04-29 11:07:29 +08:00 |
|
sxu
|
75c74bedcb
|
bug 5806
|
2025-04-29 11:02:22 +08:00 |
|
gaowdong
|
4ad58496a8
|
bug
|
2025-04-29 10:59:20 +08:00 |
|
gaowdong
|
9f12744678
|
bug
|
2025-04-29 10:22:35 +08:00 |
|
sxu
|
466f2454e8
|
bug 5801
|
2025-04-29 10:21:00 +08:00 |
|
sxu
|
94daf19822
|
Merge remote-tracking branch 'origin/master'
|
2025-04-29 10:09:00 +08:00 |
|
sxu
|
3a160c97f8
|
bug 5803
|
2025-04-29 10:08:56 +08:00 |
|
gaowdong
|
1c45e9862a
|
Merge remote-tracking branch 'origin/master'
|
2025-04-29 09:55:00 +08:00 |
|
gaowdong
|
3bb59100df
|
5854
|
2025-04-29 09:54:46 +08:00 |
|
jjLv
|
3f4ed89707
|
Merge remote-tracking branch 'origin/master'
|
2025-04-29 09:49:03 +08:00 |
|
jjLv
|
059bd787c7
|
人员修改
|
2025-04-29 09:48:53 +08:00 |
|
sxu
|
faf6075b08
|
Merge remote-tracking branch 'origin/master'
|
2025-04-29 09:48:01 +08:00 |
|
sxu
|
76db58bf06
|
bug 5803
|
2025-04-29 09:47:57 +08:00 |
|
gaowdong
|
a17b94f142
|
Merge remote-tracking branch 'origin/master'
|
2025-04-29 09:41:34 +08:00 |
|
gaowdong
|
768e3eca51
|
bug 修复
|
2025-04-29 09:41:20 +08:00 |
|
jjLv
|
ad7fe392f1
|
设备管理修改
|
2025-04-29 09:27:24 +08:00 |
|
gaowdong
|
253f49b998
|
判断账户状态-是否删除
|
2025-04-29 09:19:01 +08:00 |
|
gaowdong
|
2ea8acf019
|
订单-核销
|
2025-04-28 16:01:30 +08:00 |
|
gaowdong
|
d846f0160b
|
账户 过滤 已经删除用户
|
2025-04-28 15:14:54 +08:00 |
|
gaowdong
|
f9e92a27f3
|
订单-用户
|
2025-04-28 14:59:53 +08:00 |
|
gaowdong
|
5e38ad18dd
|
订单核销
|
2025-04-28 14:24:55 +08:00 |
|
jjLv
|
38f6c4acff
|
用户信息加入nickName
|
2025-04-28 10:58:46 +08:00 |
|
gaowdong
|
bf96ef67b0
|
订单
|
2025-04-28 10:56:44 +08:00 |
|
gaowdong
|
7a4f4062bc
|
Merge remote-tracking branch 'origin/master'
|
2025-04-28 10:32:40 +08:00 |
|
gaowdong
|
81f77eda76
|
订单
|
2025-04-28 10:32:33 +08:00 |
|
liux
|
a107b2b170
|
菜谱问题修复
|
2025-04-28 09:22:11 +08:00 |
|
sxu
|
9b2045952e
|
收藏问题
|
2025-04-28 06:13:34 +08:00 |
|
sxu
|
52c8593ca1
|
收藏问题
|
2025-04-27 18:32:13 +08:00 |
|
sxu
|
08179ce4c3
|
区域树
|
2025-04-27 18:03:17 +08:00 |
|
sxu
|
d5d9fd4132
|
Merge remote-tracking branch 'origin/master'
|
2025-04-27 17:54:05 +08:00 |
|
sxu
|
ef43aef4af
|
菜品dishesId
|
2025-04-27 17:54:02 +08:00 |
|
jjLv
|
7f3210b7ed
|
消费机自动更新
|
2025-04-27 15:17:09 +08:00 |
|
jjLv
|
3212a16544
|
用户更改
|
2025-04-27 10:35:38 +08:00 |
|
sxu
|
d486c7a194
|
Merge remote-tracking branch 'origin/master'
|
2025-04-27 08:56:43 +08:00 |
|
sxu
|
9493284019
|
菜品评价
|
2025-04-26 16:15:46 +08:00 |
|
sxu
|
15dffba36b
|
菜品评价
|
2025-04-26 15:36:41 +08:00 |
|
sxu
|
091e6cc46b
|
菜品收藏优化
|
2025-04-26 15:02:30 +08:00 |
|
sxu
|
c53ef6bbbe
|
卡片用户昵称
|
2025-04-26 14:27:39 +08:00 |
|
sxu
|
ed916c4d76
|
卡片用户昵称
|
2025-04-26 14:22:53 +08:00 |
|
jjLv
|
4cb02390ed
|
用户更改
|
2025-04-25 17:33:23 +08:00 |
|
gaowdong
|
309ee07859
|
订单
|
2025-04-25 09:07:37 +08:00 |
|
gaowdong
|
d96ce38b1c
|
报表
|
2025-04-24 14:39:59 +08:00 |
|
gaowdong
|
a293017a3b
|
报表
|
2025-04-24 14:27:45 +08:00 |
|
gaowdong
|
6de80d4ab1
|
Merge remote-tracking branch 'origin/master'
|
2025-04-24 13:53:33 +08:00 |
|
gaowdong
|
b8060c39c7
|
订单提交
|
2025-04-24 13:53:01 +08:00 |
|
jjLv
|
bf4918a7cb
|
双屏机
|
2025-04-24 13:28:57 +08:00 |
|
sxu
|
22537257f5
|
Merge remote-tracking branch 'origin/master'
|
2025-04-24 13:15:44 +08:00 |
|
sxu
|
c451cf8045
|
订单菜谱评价
|
2025-04-24 13:15:37 +08:00 |
|
gaowdong
|
0a5d34f2a7
|
Merge remote-tracking branch 'origin/master'
|
2025-04-24 13:09:22 +08:00 |
|
gaowdong
|
1e72dd1545
|
报表
|
2025-04-24 13:09:15 +08:00 |
|
sxu
|
c2c1ee45f7
|
Merge remote-tracking branch 'origin/master'
|
2025-04-24 12:12:10 +08:00 |
|
sxu
|
24aa5196ce
|
卡片管理
|
2025-04-24 12:12:08 +08:00 |
|
gaowdong
|
e998808551
|
查询修改
|
2025-04-24 11:04:26 +08:00 |
|
gaowdong
|
8e52b85a55
|
查询修改
|
2025-04-24 10:30:58 +08:00 |
|
sxu
|
8365a5fa84
|
卡片管理
|
2025-04-24 09:52:55 +08:00 |
skjia
|
ec75df799b
|
jsk 商超
|
2025-04-23 22:37:03 +08:00 |
|
sxu
|
64872c4ee8
|
Merge remote-tracking branch 'origin/master'
|
2025-04-23 19:22:44 +08:00 |
|
sxu
|
e377e61833
|
卡片管理
|
2025-04-23 19:22:36 +08:00 |
|
sxu
|
7e9c899e91
|
卡片管理
|
2025-04-23 18:22:31 +08:00 |
|
gaowdong
|
4c0affefce
|
消费汇总
|
2025-04-23 18:18:41 +08:00 |
|
sxu
|
c97abd5024
|
卡片管理
|
2025-04-23 18:00:33 +08:00 |
|
sxu
|
8cc276ae19
|
卡片管理
|
2025-04-23 17:30:00 +08:00 |
|
sxu
|
25e8e7a67e
|
卡片管理
|
2025-04-23 16:42:03 +08:00 |
|
sxu
|
1bc3bcd67a
|
卡片管理
|
2025-04-23 12:25:55 +08:00 |
|
sxu
|
003cb3b943
|
人脸
|
2025-04-23 10:33:47 +08:00 |
|
sxu
|
56c277293e
|
人脸
|
2025-04-23 09:53:33 +08:00 |
|
sxu
|
87f66ad049
|
Merge remote-tracking branch 'origin/master'
|
2025-04-23 09:50:01 +08:00 |
|
sxu
|
8b39a21fab
|
人脸
|
2025-04-23 09:49:52 +08:00 |
|
jjLv
|
37a7b40e2f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuRecipeMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java
# bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml
|
2025-04-23 09:40:12 +08:00 |
|
jjLv
|
953f9d7bd8
|
双屏机
|
2025-04-23 09:37:24 +08:00 |
|
sxu
|
6dddd5f9e4
|
人脸
|
2025-04-23 09:12:47 +08:00 |
|
gaowdong
|
4108a8be68
|
订单-验证
|
2025-04-22 18:54:56 +08:00 |
|
gaowdong
|
ed8ded5420
|
订单-验证
|
2025-04-22 18:54:44 +08:00 |
|
gaowdong
|
21ac614166
|
报表
|
2025-04-22 18:27:21 +08:00 |
|
liux
|
63d4951a3b
|
菜谱导入和菜谱定时任务
|
2025-04-22 18:02:01 +08:00 |
|
liux
|
d90a34a220
|
菜品导入
|
2025-04-22 13:46:38 +08:00 |
|
gaowdong
|
7ec208c6d9
|
报表-交易流水
|
2025-04-21 16:59:40 +08:00 |
|
sxu
|
ad1a3b605b
|
Merge remote-tracking branch 'origin/master'
|
2025-04-21 16:18:21 +08:00 |
|
sxu
|
d7314c40a5
|
评价管理
|
2025-04-21 16:12:38 +08:00 |
|
gaowdong
|
03e2fe84c0
|
交易记录修改
|
2025-04-21 15:13:21 +08:00 |
|
gaowdong
|
1e2ad095b5
|
个人取款 及记录查询
|
2025-04-21 14:04:23 +08:00 |
|
liux
|
06a083c91a
|
菜谱
|
2025-04-21 11:42:07 +08:00 |
|
liux
|
0fa9bb8baa
|
菜品查询、修改、删除
|
2025-04-21 11:20:05 +08:00 |
|
liux
|
8d6d145dff
|
菜品查询、修改、删除
|
2025-04-21 10:57:11 +08:00 |
|
gaowdong
|
bfeb28a945
|
设备超市订单
|
2025-04-21 10:10:06 +08:00 |
|
sxu
|
b6919b8fd2
|
健康信息
|
2025-04-20 20:26:58 +08:00 |
|
sxu
|
ca9cdfd700
|
menu_*
|
2025-04-20 20:20:28 +08:00 |
|
sxu
|
1a74d4f6ec
|
alloc_canteen_suggestion
|
2025-04-20 20:14:55 +08:00 |
|
sxu
|
04d98c266b
|
acc_card
|
2025-04-20 20:12:51 +08:00 |
|
liux
|
e4473d5c8a
|
菜品，菜谱，档口相关问题修复，接口编写，更新此版本 本地数据库需执行添加以下sql语句：
ALTER TABLE menu_dishes
ADD COLUMN label_id VARCHAR(32) COMMENT '标签id' AFTER remark,
ADD COLUMN taste_id VARCHAR(32) COMMENT '口味id' AFTER label_id,
ADD COLUMN season_id VARCHAR(32) COMMENT '分类id' AFTER taste_id,
ADD COLUMN suit_id VARCHAR(32) COMMENT '适宜人群id' AFTER season_id,
ADD COLUMN meal_id VARCHAR(32) COMMENT '餐次id' AFTER suit_id;
|
2025-04-19 14:50:28 +08:00 |
|
jjLv
|
28782ce71c
|
双屏机
|
2025-04-18 20:06:41 +08:00 |
|
gaowdong
|
6691aee33b
|
设备订单
|
2025-04-18 18:14:00 +08:00 |
|
gaowdong
|
7d21959bbb
|
Merge remote-tracking branch 'origin/master'
|
2025-04-18 18:04:27 +08:00 |
|
gaowdong
|
0640f63ed8
|
设备订单
|
2025-04-18 18:04:20 +08:00 |
|
sxu
|
9aaa39904c
|
预订餐菜品图片 fix
|
2025-04-18 17:57:59 +08:00 |
|
sxu
|
2c31f59d84
|
菜品添加及搜索 fix
|
2025-04-18 17:14:51 +08:00 |
|
sxu
|
610999008c
|
Merge remote-tracking branch 'origin/master'
|
2025-04-18 16:35:44 +08:00 |
|
sxu
|
36e3c749bc
|
原料筛选 fix
|
2025-04-18 16:32:52 +08:00 |
|
gaowdong
|
144559884a
|
Merge remote-tracking branch 'origin/master'
|
2025-04-18 16:22:57 +08:00 |
|
gaowdong
|
db1cb776fc
|
设备订单支付方式
|
2025-04-18 16:22:50 +08:00 |
|
sxu
|
8109fd4291
|
menu_nutrition del_flag fix
|
2025-04-18 16:20:55 +08:00 |
|
sxu
|
35df8518b7
|
menu_dishes_type crby fix
|
2025-04-18 16:11:18 +08:00 |
|
sxu
|
f010bf8fc3
|
menu_dishes_type crby fix
|
2025-04-18 16:10:05 +08:00 |
|
sxu
|
dd813f12b2
|
menu_dishes_type crby fix
|
2025-04-18 16:06:23 +08:00 |
|
sxu
|
9fa938d839
|
menu_dishes_type crby fix
|
2025-04-18 16:05:55 +08:00 |
|
gaowdong
|
bf2194c331
|
Merge remote-tracking branch 'origin/master'
|
2025-04-18 15:33:20 +08:00 |
|
gaowdong
|
a4e4fc6e7f
|
订单
|
2025-04-18 15:33:14 +08:00 |
|
sxu
|
b4c1cfbc6e
|
menu_dishes menu_dishes_base crby fix
|
2025-04-18 15:31:14 +08:00 |
|
sxu
|
9a2a6db3a6
|
预订餐h5
|
2025-04-18 15:14:13 +08:00 |
|
sxu
|
3ba062c3d5
|
预订餐档口信息
|
2025-04-18 14:26:25 +08:00 |
|
sxu
|
008f4f6dd4
|
预订餐档口信息
|
2025-04-18 14:17:51 +08:00 |
|
sxu
|
2ea049b31e
|
删除菜品relation表
|
2025-04-18 13:14:23 +08:00 |
|
sxu
|
05d652a3c6
|
预订餐时间
|
2025-04-18 11:11:26 +08:00 |
|
liux
|
36651eafb5
|
营养修复
|
2025-04-18 10:06:08 +08:00 |
|
sxu
|
c845f5f0ca
|
Merge remote-tracking branch 'origin/master'
|
2025-04-18 10:04:57 +08:00 |
|
sxu
|
c4210a8db9
|
编辑菜谱报错
|
2025-04-18 10:04:48 +08:00 |
|
gaowdong
|
d09254f0bb
|
订单-支付
|
2025-04-18 09:55:33 +08:00 |
|
sxu
|
a5256a3cf9
|
食堂档口管理员
|
2025-04-17 20:27:42 +08:00 |
|
sxu
|
198abaa8ae
|
Merge branch 'master' into test417
|
2025-04-17 20:17:49 +08:00 |
|
sxu
|
f493418e79
|
食堂档口默认值
|
2025-04-17 20:16:50 +08:00 |
|
sxu
|
c161129adc
|
Merge branch 'master' into test417
|
2025-04-17 18:34:29 +08:00 |
|
liux
|
beaeb5eade
|
H5一周菜谱
|
2025-04-17 18:33:49 +08:00 |
|
sxu
|
11a9323471
|
Merge remote-tracking branch 'origin/master'
|
2025-04-17 18:16:39 +08:00 |
|
sxu
|
a4bae07dea
|
原料导航树参与搜索
|
2025-04-17 18:15:25 +08:00 |
|
gaowdong
|
5685268540
|
订单-查询
|
2025-04-17 18:09:54 +08:00 |
|
gaowdong
|
eafc296fcb
|
订单-下单退单
|
2025-04-17 17:33:55 +08:00 |
|
gaowdong
|
bfff4d73a1
|
订单-下单退单
|
2025-04-17 17:08:23 +08:00 |
|
gaowdong
|
dd8d7f5bd4
|
订单-下单退单
|
2025-04-17 16:46:14 +08:00 |
|
sxu
|
eb1e8a6b39
|
菜品图片回显
|
2025-04-17 16:38:14 +08:00 |
|
sxu
|
58844b2da4
|
Merge remote-tracking branch 'origin/master'
|
2025-04-17 16:12:10 +08:00 |
|
sxu
|
5c38dfa41a
|
去除MgrUserAuthPO.java
|
2025-04-17 16:12:07 +08:00 |
|
liux
|
c7fb27d813
|
H5一周菜谱
|
2025-04-17 16:11:05 +08:00 |
|
gaowdong
|
1d63ce61b3
|
订单-购物车
|
2025-04-17 15:00:16 +08:00 |
|
liux
|
0bfaeb6ef5
|
Merge remote-tracking branch 'origin/master'
|
2025-04-17 14:35:07 +08:00 |
|
sxu
|
c4c8e3f7bd
|
营养信息-增删改查
|
2025-04-17 14:34:13 +08:00 |