6 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
lvmeng	dd51448aea	处理gradle冲突	2025-10-16 19:44:28 +08:00
lvmeng	b62738aa15	Merge branch 'dev_lvmeng_1016' ... # Conflicts: # app/build.gradle.kts # build.gradle.kts # settings.gradle.kts	2025-10-16 19:30:22 +08:00
lvmeng	7a60f4b34d	Merge remote-tracking branch 'origin/master'	2025-10-16 19:23:58 +08:00
lvmeng	c23aedf464	支持菜品识别	2025-10-16 19:20:59 +08:00
lvmeng	d9b725cb63	Merge remote-tracking branch 'origin/master'	2025-10-16 13:35:06 +08:00
lvmeng	caefbd0944	优化	2025-09-26 16:02:18 +08:00