Commit Graph

154 Commits

Author SHA1 Message Date
4b535de1c2 添加字段 2024-10-05 17:57:43 +08:00
e60c83a9d4 获取信息 2024-09-30 19:14:56 +08:00
7af0a37dd4 注释人脸删除 2024-09-30 15:27:57 +08:00
3fdd813f5c 更新 2024-09-30 12:41:00 +08:00
0dc4181487 管理员卡号不能绑定 2024-09-30 10:41:16 +08:00
5b24efb3ef 根据mac获取门店 2024-09-29 22:44:55 +08:00
cc46939e86 超市 2024-09-29 17:31:59 +08:00
0febebc82f 修改 2024-09-29 15:39:10 +08:00
0ad32f2537 修改 2024-09-29 15:13:48 +08:00
6028dd39c6 修改 2024-09-29 15:01:35 +08:00
a0509eadd4 录入判定 2024-09-29 11:12:07 +08:00
84e3105eee 超市 2024-09-27 18:18:44 +08:00
35f549ef70 更改文件名 2024-09-27 11:40:34 +08:00
dd6da99a5d 配置文件 2024-09-27 11:29:34 +08:00
58e4d5d1d4 超市 2024-09-27 11:23:59 +08:00
a8661ee306 Merge branch 'refs/heads/分账重构' 2024-09-26 18:16:20 +08:00
8166b6745f 清空判定 2024-09-26 18:06:47 +08:00
ebc6696074 Merge branch 'refs/heads/分账重构' 2024-09-26 10:41:22 +08:00
67fe0b5563 去掉分账 2024-09-26 10:40:53 +08:00
f7fa940e5c Merge branch 'refs/heads/分账重构' 2024-09-25 16:06:29 +08:00
101251c777 新版 2024-09-25 16:05:27 +08:00
c6419745a7 新版 2024-09-25 16:02:00 +08:00
8571c7c29c Merge branch 'refs/heads/分账重构' 2024-08-22 09:28:15 +08:00
6efff70a60 优化 2024-08-22 09:27:38 +08:00
d21e0d87e0 Merge branch 'refs/heads/分账重构' 2024-08-19 16:32:49 +08:00
5e7ecfa56d 处理菜品不存在的情况 2024-08-19 16:32:13 +08:00
dfbf13a76f Merge branch 'refs/heads/分账重构' 2024-08-19 15:39:54 +08:00
644eedc160 营业额 2024-08-19 15:39:32 +08:00
5188b60b97 Merge branch 'refs/heads/分账重构'
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
2024-08-19 15:01:22 +08:00
51f61628ab 修改菜品逻辑 2024-08-19 15:00:17 +08:00
6b0d087135 修改菜品逻辑 2024-08-19 14:54:34 +08:00
53cebf639c 修改菜品逻辑 2024-08-19 14:49:01 +08:00
3873ef712f Merge branch 'refs/heads/分账重构' 2024-08-19 13:53:47 +08:00
a12212c689 修改菜品逻辑 2024-08-19 13:53:16 +08:00
267b024e0a Merge branch 'refs/heads/分账重构-总和' 2024-08-19 09:47:31 +08:00
8ccac59b95 分账处理 2024-08-19 09:46:19 +08:00
275d711f68 Merge branch 'refs/heads/分账重构' 2024-08-16 18:00:35 +08:00
fc45e8b84e 分账重构 2024-08-16 18:00:08 +08:00
cbea8819af Merge branch 'refs/heads/test' 2024-08-14 11:35:06 +08:00
201da3b318 分账回退更改 2024-08-14 11:34:39 +08:00
3efba48916 Merge branch 'refs/heads/test' 2024-08-13 17:48:50 +08:00
b7e004dd50 8.13优化 2024-08-13 17:48:15 +08:00
d95d3df3f4 Merge branch 'refs/heads/test' 2024-08-06 18:38:38 +08:00
0268c349cd 标签 2024-08-06 18:25:40 +08:00
b937221b75 Merge branch 'refs/heads/test' 2024-07-26 16:26:38 +08:00
3bd4199bf5 退款提现 2024-07-26 16:25:49 +08:00
1de2f8a6b7 退款提现 2024-07-26 14:33:43 +08:00
965937555f Merge branch 'refs/heads/test' 2024-07-24 14:22:23 +08:00
82eb8b56ce bug修改 2024-07-24 14:21:38 +08:00
5a8cecba76 Merge branch 'refs/heads/test' 2024-07-22 18:24:48 +08:00