Merge branch 'master' of https://github.com/suhf/No1WMS

src/main/resources/mappers/StockMapper.xml

@@ -230,4 +230,4 @@
         INSERT INTO stock (id, warehouse_id, product_id, quantity, activation)
         VALUES (UUID(), #{warehouseId}, #{productId}, #{quantity}, 1)
     </insert>
-</mapper>
+</mapper>

src/main/webapp/WEB-INF/views/base/main.jsp

@@ -148,4 +148,4 @@
     });
 </script>
 </body>
-</html>
+</html>