shopping commit

.idea/dictionaries/Administrator.xml

@@ -1,8 +1,10 @@
 <component name="ProjectDictionaryState">
   <dictionary name="Administrator">
     <words>
+      <w>loign</w>
       <w>productinfo</w>
       <w>productlist</w>
+      <w>upass</w>
       <w>userlist</w>
     </words>
   </dictionary>

.idea/workspace.xml

@@ -10,27 +10,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="841a97d6-fb7a-4203-9936-89f5a7cbed8f" name="变更" comment="shopping commit">
-      <change afterPath="$PROJECT_DIR$/.idea/dictionaries/Administrator.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/dictionaries/Administrator.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dictionaries/Administrator.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/demo3/util/AutoTypeDate.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/77d09f07-528f-4f0e-a7ab-56ce72dcd0ca.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/77d09f07-528f-4f0e-a7ab-56ce72dcd0ca.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/UserMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/404.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/404.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/about.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/about.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/blog-details.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/blog-details.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/blog.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/blog.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/cart.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/cart.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/checkout.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/checkout.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/contact.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/contact.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/index.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/login.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/login.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/product-details-1.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/product-details-1.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/service.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/service.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/shop.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/shop.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/team.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/team.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/wishlist.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/wishlist.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/说明.htm" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/说明.jsp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -280,7 +261,7 @@
       <workItem from="1652815871388" duration="3279000" />
       <workItem from="1652812440545" duration="5898000" />
       <workItem from="1652862263978" duration="1130000" />
-      <workItem from="1652863421193" duration="5913000" />
+      <workItem from="1652863421193" duration="6214000" />
     </task>
     <task id="LOCAL-00001" summary="shopping commit">
       <created>1652814834331</created>
@@ -317,7 +298,14 @@
       <option name="project" value="LOCAL" />
       <updated>1652860651524</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="shopping commit">
+      <created>1652870417244</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1652870417244</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

src/main/resources/UserMapper.xml

@@ -21,8 +21,6 @@
     <sql id="product2">
         product_id as productId2 , product_name as productName2 , product_number as productNumber2 , product_price as productPrice2 , product_type as productType , product_data as productData , product_traffic as productTraffic , product_like as productLike
     </sql>
-
-
     <select id="getAll" parameterType="String" resultType="com.example.demo3.pojo.use">
         select <include refid="user1"></include> from userinfo;
     </select>