 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 |
|
liux
|
468d05804c
|
H5一周菜谱
|
2025-04-17 14:04:14 +08:00 |
|
sxu
|
aa72d471d4
|
test
|
2025-04-17 13:18:25 +08:00 |
|
sxu
|
db3812406e
|
test
|
2025-04-17 13:15:05 +08:00 |
|
sxu
|
1a89497dde
|
test
|
2025-04-17 13:09:10 +08:00 |
|
sxu
|
404afb709d
|
test
|
2025-04-17 11:22:26 +08:00 |
|
gaowdong
|
deac8fc77b
|
订单
|
2025-04-17 11:20:25 +08:00 |
|
gaowdong
|
52564191ca
|
订单
|
2025-04-17 11:07:49 +08:00 |
|
sxu
|
e2b43a52d7
|
test
|
2025-04-17 11:05:46 +08:00 |
|
sxu
|
9c9935b57e
|
test
|
2025-04-17 10:53:45 +08:00 |
|
sxu
|
92a0af2dbc
|
test
|
2025-04-17 10:47:47 +08:00 |
|
gaowdong
|
d39356eddb
|
订单
|
2025-04-16 17:57:24 +08:00 |
|
sxu
|
65a862121e
|
餐次配置
|
2025-04-16 17:54:44 +08:00 |
|
sxu
|
2b6d71ed50
|
餐次配置
|
2025-04-16 17:46:47 +08:00 |
|
sxu
|
b174488936
|
账号删除
|
2025-04-16 16:52:27 +08:00 |
|
liux
|
7078e8d401
|
联调修改
|
2025-04-16 11:19:06 +08:00 |
|
liux
|
35881c05f1
|
联调修改
|
2025-04-16 11:08:57 +08:00 |
|
liux
|
ae02fbcd8f
|
联调修改
|
2025-04-16 11:04:04 +08:00 |
|
gaowdong
|
72888e955a
|
账户变动发送mq
|
2025-04-16 09:55:14 +08:00 |
|
gaowdong
|
68fdd4f485
|
Merge remote-tracking branch 'origin/master'
|
2025-04-15 18:27:56 +08:00 |
|
gaowdong
|
2cbcc0565d
|
订单
|
2025-04-15 18:27:49 +08:00 |
|
liux
|
81b74ecc87
|
菜谱信息接口
|
2025-04-15 18:07:15 +08:00 |
|
gaowdong
|
b27cbe1189
|
账户变动发送mq
|
2025-04-15 17:58:18 +08:00 |
|
gaowdong
|
5d2ccd55cd
|
订单
|
2025-04-15 17:16:30 +08:00 |
|
liux
|
71dc65ace0
|
菜谱信息接口
|
2025-04-14 23:58:26 +08:00 |
|
jjLv
|
5d4ea5327d
|
json转换
|
2025-04-14 23:57:22 +08:00 |
|
jjLv
|
cd5e7096bb
|
菜谱列表
|
2025-04-14 23:16:37 +08:00 |
|
jjLv
|
b67efb60e9
|
菜谱列表-删除、详情
|
2025-04-14 20:22:57 +08:00 |
|
sxu
|
c7189d5cfb
|
后台评价管理
|
2025-04-14 20:05:17 +08:00 |
|
sxu
|
4364ce9d57
|
图片文件， 区域选择问题修复
|
2025-04-14 20:01:07 +08:00 |
|
sxu
|
bd4604c3db
|
Merge remote-tracking branch 'origin/master'
|
2025-04-14 18:18:26 +08:00 |
|
sxu
|
b0aba784e1
|
注释多余mq推送
|
2025-04-14 18:18:20 +08:00 |
|
gaowdong
|
24b0ea29fc
|
Merge remote-tracking branch 'origin/master'
|
2025-04-14 18:05:12 +08:00 |
|
gaowdong
|
ebd524e694
|
订单
|
2025-04-14 18:04:16 +08:00 |
|
jjLv
|
0cefb29322
|
菜谱列表-新增
|
2025-04-14 18:01:27 +08:00 |
|
gaowdong
|
5a9abe6a2c
|
订单
|
2025-04-14 17:38:59 +08:00 |
|
gaowdong
|
a7ee37083c
|
订单
|
2025-04-14 17:31:48 +08:00 |
|
sxu
|
690613e494
|
地址
|
2025-04-14 17:12:00 +08:00 |
|
sxu
|
f89b757232
|
地址
|
2025-04-14 17:00:21 +08:00 |
|
sxu
|
61b5737f3d
|
评价
|
2025-04-14 16:50:36 +08:00 |
|
sxu
|
a52ed369b5
|
上传人脸接口
|
2025-04-14 16:26:03 +08:00 |
|
sxu
|
9e8bf10987
|
恢复人脸linux依赖
|
2025-04-14 14:24:03 +08:00 |
|
jjLv
|
88d7b21933
|
菜谱列表-新增
|
2025-04-14 13:41:13 +08:00 |
|
sxu
|
5257be7a39
|
人脸接口改动
|
2025-04-14 13:24:50 +08:00 |
|
jjLv
|
6a8aeca08f
|
菜谱列表-获取菜品列表
|
2025-04-14 13:14:16 +08:00 |
|
sxu
|
36758547b1
|
acc soft delete
|
2025-04-14 12:41:47 +08:00 |
|
gaowdong
|
6eb3311a8c
|
购物车
|
2025-04-14 11:33:36 +08:00 |
|
gaowdong
|
09f58bf26a
|
购物车
|
2025-04-14 11:33:05 +08:00 |
|
gaowdong
|
9cba426a01
|
购物车
|
2025-04-14 11:27:07 +08:00 |
|
gaowdong
|
a8d5a507e3
|
购物车
|
2025-04-14 11:25:41 +08:00 |
|
gaowdong
|
dd1a88b704
|
修改
|
2025-04-14 09:58:16 +08:00 |
|
gaowdong
|
bb6df411c7
|
修改
|
2025-04-14 09:52:56 +08:00 |
|
gaowdong
|
75e4754ecd
|
Merge remote-tracking branch 'origin/master'
|
2025-04-14 09:50:12 +08:00 |
|
gaowdong
|
41f2183d37
|
新增
|
2025-04-14 09:50:04 +08:00 |
|
liux
|
30e89d4fa3
|
Merge remote-tracking branch 'origin/master'
|
2025-04-14 09:46:10 +08:00 |
|
gaowdong
|
2e76407706
|
删除
|
2025-04-14 09:15:34 +08:00 |
|
jjLv
|
8602e68f37
|
双屏消费机-用户信息查询、mq推送
|
2025-04-14 09:12:03 +08:00 |
|
liux
|
ebc2d7b0c2
|
营养类别等相关接口调试修复
|
2025-04-12 20:56:31 +08:00 |
|
gaowdong
|
53584586d5
|
修改钱包发送mq
|
2025-04-11 13:33:33 +08:00 |
|
sxu
|
ff812e298d
|
新增用户推送
|
2025-04-11 13:20:27 +08:00 |
|
gaowdong
|
f2c63d168a
|
个人钱包-线下充值，直接输入金额
个人钱包-离职时，清空金额
|
2025-04-11 13:13:24 +08:00 |
|
sxu
|
dbacf19ad0
|
充值
|
2025-04-11 10:15:39 +08:00 |
|
sxu
|
7605359104
|
Merge remote-tracking branch 'origin/master'
|
2025-04-10 18:48:07 +08:00 |
|
sxu
|
66ee64f211
|
mq
|
2025-04-10 18:48:00 +08:00 |
skjia
|
31ef454db0
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Canteen
|
2025-04-10 18:41:15 +08:00 |
|
gaowdong
|
77d34b8f04
|
钱包管理-抛异常 回滚交易
|
2025-04-10 18:38:29 +08:00 |
|
skjia
|
86e5c43d69
|
jsk 商超管理
|
2025-04-10 18:27:46 +08:00 |
|
gaowdong
|
67c7bbc121
|
补贴管理/账户管理修改
|
2025-04-10 17:24:20 +08:00 |
|
jjLv
|
4498029f6c
|
双屏消费机-人脸特征值、设备信息接口
|
2025-04-10 17:14:58 +08:00 |
|
sxu
|
e13ee9c5c0
|
充值保护
|
2025-04-10 15:15:57 +08:00 |
|
sxu
|
a019db6d13
|
batchInsertAccWalletInfo
|
2025-04-10 14:08:18 +08:00 |
|
sxu
|
82766f76c5
|
biz-util move to core-util
|
2025-04-10 13:47:45 +08:00 |
|
gaowdong
|
240c49a5b7
|
补贴管理 =
|
2025-04-10 13:13:16 +08:00 |
|
liux
|
4fe71a435b
|
营养类别等相关接口调试修复
|
2025-04-10 10:23:54 +08:00 |
|
liux
|
4015c6942f
|
营养类别等相关接口改动
|
2025-04-10 09:22:32 +08:00 |
|
sxu
|
4d50b29254
|
fix conflict
|
2025-04-09 18:31:04 +08:00 |
|
sxu
|
e3dfcb0e1d
|
充值
|
2025-04-09 18:27:51 +08:00 |
|
gaowdong
|
96a1340159
|
补贴管理 - 操作记录
|
2025-04-09 18:23:02 +08:00 |
|
gaowdong
|
f3d3268f7b
|
补贴管理 - 操作记录
|
2025-04-09 16:48:31 +08:00 |
|
liux
|
8879270fac
|
营养、原料相关接口编写
|
2025-04-09 15:30:33 +08:00 |
|
gaowdong
|
7e2e18dc5d
|
补贴管理 - 批量操作预检
|
2025-04-09 14:11:44 +08:00 |
|
sxu
|
f25aabd615
|
再次查询充值
|
2025-04-09 13:46:33 +08:00 |