Merge remote-tracking branch 'origin/main'

# Conflicts: # SunShine/urls.py
finsh2-1
2 changed files with 388 additions and 0 deletions
--- a/SunShine/urls.py
+++ b/SunShine/urls.py
@ -25,6 +25,7 @@ from django.conf.urls.static import static
 urlpatterns = [
    path('admin/', admin.site.urls),
    path('SS01/', include('SS01.urls')),
+    path('', views.login,name='login'),
 ]

 urlpatterns += static(settings.MEDIA_URL,document_root=settings.MEDIA_ROOT)
--- a/sunshine.sql
+++ b/sunshine.sql
Author	SHA1	Message	Date
ljy	3d29dd71e1	Merge remote-tracking branch 'origin/main' # Conflicts: # SunShine/urls.py	9 months ago
ljy	4826cb6dce	finsh2-1	9 months ago