myh
							
						 
					 | 
					
						
						
							
						
						a3275155bf
					 | 
					
						
						
							
							项目目录修改
						
						
						
						
						
						
					 | 
					
						2023-06-07 19:43:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								myh
							
						 
					 | 
					
						
						
							
						
						b0e70dc3eb
					 | 
					
						
						
							
							小bug修改
						
						
						
						
						
						
					 | 
					
						2023-05-14 21:48:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						1fbd2a6553
					 | 
					
						
						
							
							完善DAO层,重构代码,添加了登录功能,修改了一堆bug,具体见日志
						
						
						
						
						
						
					 | 
					
						2023-05-07 21:07:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						96d55c83c3
					 | 
					
						
						
							
							重构代码,DAO层全部完成
						
						
						
						
						
						
					 | 
					
						2023-05-07 14:29:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						f9c276e0ed
					 | 
					
						
						
							
							Bug fixed,调整了项目结构。还有就是我恨DDL
						
						
						
						
						
						
					 | 
					
						2023-05-05 23:09:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						3dc0a891fb
					 | 
					
						
						
							
							Bug Fixed。完成ShellUI、UserDAO、merchantsDAO,测试通过
						
						
						
						
						
						
					 | 
					
						2023-05-05 20:06:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						135e2156dd
					 | 
					
						
						
							
							UserDAO以及MerchantsDAO抽象接口的实现,ShellUI的部分功能
						
						
						
						
						
						
					 | 
					
						2023-05-05 14:18:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						460f276596
					 | 
					
						
						
							
							商家实体类加了点东西,之前漏了
						
						
						
						
						
						
					 | 
					
						2023-03-27 21:00:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						d2b9f2e016
					 | 
					
						
						
							
							Merge branch '20172'
						
						
						
						
						
						
						
						# Conflicts:
#	.gitignore
#	README.md 
						
						
					 | 
					
						2023-03-26 23:03:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						e74fb7da1a
					 | 
					
						
						
							
							更新readme.md
						
						
						
						
						
						
					 | 
					
						2023-03-26 23:02:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						b010f89689
					 | 
					
						
						
							
							随便修改了点东西,试一下忽略.idea文件成功了没
						
						
						
						
						
						
					 | 
					
						2023-03-26 22:55:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								孟云浩
							
						 
					 | 
					
						
						
							
						
						02c0d23e26
					 | 
					
						
						
							
							删除文件 .idea
						
						
						
						
						
						
					 | 
					
						2023-03-26 14:54:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						ef3d2de757
					 | 
					
						
						
							
							忽略.idea文件,求求你了赶紧成功叭
						
						
						
						
						
						
					 | 
					
						2023-03-26 22:51:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						06b0f2c138
					 | 
					
						
						
							
							忽略.idea文件,求求你了赶紧成功叭
						
						
						
						
						
						
					 | 
					
						2023-03-26 22:50:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						397c4e1386
					 | 
					
						
						
							
							忽略.idea文件
						
						
						
						
						
						
					 | 
					
						2023-03-26 22:46:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						7e90c20648
					 | 
					
						
						
							
							忽略.idea文件
						
						
						
						
						
						
					 | 
					
						2023-03-26 22:45:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								孟云浩
							
						 
					 | 
					
						
						
							
						
						2efb7204ea
					 | 
					
						
						
							
							Delete .idea directory
						
						
						
						
						
						
					 | 
					
						2023-03-26 22:28:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						8fb0d3efca
					 | 
					
						
						
							
							忽略.idea文件
						
						
						
						
						
						
					 | 
					
						2023-03-26 22:25:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						cd77c9c598
					 | 
					
						
						
							
							Merge branch '20172'
						
						
						
						
						
						
					 | 
					
						2023-03-26 22:16:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						2023f3b1be
					 | 
					
						
						
							
							完善实体类。另外为啥这个.idea文件隐藏了还是会被提交到git上面嘞,真玄学
						
						
						
						
						
						
					 | 
					
						2023-03-26 22:13:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						2b19fc6f62
					 | 
					
						
						
							
							格式化代码,忽略提交.idea文件
						
						
						
						
						
						
					 | 
					
						2023-03-26 22:03:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						c52ff8c0e9
					 | 
					
						
						
							
							修改完善实体类
						
						
						
						
						
						
					 | 
					
						2023-03-26 22:02:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						2bb0fcbcb1
					 | 
					
						
						
							
							Merge remote-tracking branch 'GitHubElm/main'
						
						
						
						
						
						
					 | 
					
						2023-03-26 21:52:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						5d89de2b95
					 | 
					
						
						
							
							修改完善实体类
						
						
						
						
						
						
					 | 
					
						2023-03-26 21:52:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						5bd4188939
					 | 
					
						
						
							
							修改完善实体类
						
						
						
						
						
						
					 | 
					
						2023-03-26 21:50:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						9ae538fdb3
					 | 
					
						
						
							
							Merge branch '20172'
						
						
						
						
						
						
						
						# Conflicts:
#	README.md
#	src/main/java/org/example/App.java 
						
						
					 | 
					
						2023-03-26 21:49:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						2dde240326
					 | 
					
						
						
							
							修改完善实体类
						
						
						
						
						
						
					 | 
					
						2023-03-26 21:47:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								孟云浩
							
						 
					 | 
					
						
						
							
						
						92479940a7
					 | 
					
						
						
							
							Delete .idea directory
						
						
						
						
						
						
					 | 
					
						2023-03-26 21:46:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						173a9fc74f
					 | 
					
						
						
							
							Merge remote-tracking branch 'GiteeElm/20172' into 20172
						
						
						
						
						
						
					 | 
					
						2023-03-26 21:39:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						cca9181b72
					 | 
					
						
						
							
							修改完善实体类
						
						
						
						
						
						
					 | 
					
						2023-03-26 21:38:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								孟云浩
							
						 
					 | 
					
						
						
							
						
						018517af50
					 | 
					
						
						
							
							删除文件 .idea
						
						
						
						
						
						
					 | 
					
						2023-03-22 09:10:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						41a7fe1481
					 | 
					
						
						
							
							修改README
						
						
						
						
						
						
					 | 
					
						2023-03-16 00:58:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						2501b43fcc
					 | 
					
						
						
							
							修改README,顺便测试一下推送功能
						
						
						
						
						
						
					 | 
					
						2023-03-16 00:50:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						134d739c89
					 | 
					
						
						
							
							初始化
						
						
						
						
						
						
					 | 
					
						2023-03-16 00:04:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						7bf021f7dc
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/twinkle255/Homework-Ele
						
						
						
						
						
						
					 | 
					
						2023-03-15 23:20:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinkle255
							
						 
					 | 
					
						
						
							
						
						a4c33c1155
					 | 
					
						
						
							
							初始化项目
						
						
						
						
						
						
					 | 
					
						2023-03-15 23:02:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								孟云浩
							
						 
					 | 
					
						
						
							
						
						2cb3084a9c
					 | 
					
						
						
							
							Initial commit
						
						
						
						
						
						
					 | 
					
						2023-03-15 18:11:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |