Commit Graph

140 Commits

Author SHA1 Message Date
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
ee29e19d95 商城 2024-07-22 18:24:28 +08:00
edde6c07be Merge branch 'refs/heads/test' 2024-07-22 17:55:53 +08:00
de13e25f05 门店 2024-07-22 17:44:56 +08:00
60bcdc8bc5 Merge branch 'refs/heads/test' 2024-07-22 11:42:00 +08:00
60ad369ce1 精简 2024-07-22 11:41:18 +08:00
689fe1109b Merge branch 'refs/heads/test' 2024-07-19 18:14:22 +08:00
a5dc37dd67 退款 2024-07-19 18:13:52 +08:00
a5bed8bac7 Merge branch 'refs/heads/test' 2024-07-19 10:23:40 +08:00
e91a1c95d5 添加字段 2024-07-19 10:23:07 +08:00
5c6ee56792 配置文件更新为正式服 2024-07-19 09:44:48 +08:00
de023eb5e3 分账功能 2024-07-19 09:42:18 +08:00
2f8a2ae032 优化第一版 2024-07-17 15:23:38 +08:00
f9600240d5 更改数据库 2024-07-15 09:30:18 +08:00
4d441e0ac3 优化 2024-07-12 16:01:29 +08:00