Merge remote-tracking branch 'origin/dev' into dev

08.src/Xingxi/xingxi-admin/src/main/resources/application.yml

@@ -20,6 +20,8 @@ server:
   servlet:
     # 应用的访问路径
     context-path: /
+    session:
+      timeout: 0
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8

08.src/Xingxi/xingxi-admin/src/main/resources/templates/index.html

@@ -26,7 +26,7 @@
         </div>
         <a th:href="@{/index}">
             <li class="logo hidden-xs">
-                <span class="logo-lg">RuoYi</span>
+                <span class="logo-lg">GululuQ</span>
             </li>
          </a>
         <div class="sidebar-collapse">

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/product/prod/prod.html

@@ -34,12 +34,16 @@
                                 <option th:each="ip : ${ips}" th:text="${ip.ipName}" th:value="${ip.ipId}"></option>
                             </select>
                         </div>
-<!--                        <div style="margin-left: 15px; width: 100px; float: left;">-->
-<!--                            <label class="control-label">设计师名称：</label>-->
-<!--                        </div>-->
-<!--                        <div style="width: 150px; float: left;">-->
+                        <div style="margin-left: 15px; width: 100px; float: left;">
+                            <label class="control-label">设计师名称：</label>
+                        </div>
+                        <div style="width: 150px; float: left;">
 <!--                            <input type="text" class="form-control" name="designerName">-->
-<!--                        </div>-->
+                            <select name="designerId" class="form-control m-b" th:with="designers=${@product.getDesigners()}" >
+                                <option value="">所有</option>
+                                <option th:each="designer : ${designers}" th:text="${designer.designerName}" th:value="${designer.id}"></option>
+                            </select>
+                        </div>
 <!--                        <div style="margin-left: 15px; width: 100px; float: left;">-->
 <!--                            <label class="control-label">商品描述：</label>-->
 <!--                        </div>-->

08.src/Xingxi/xingxi-mq-server/src/main/resources/config/application.yml

@@ -3,6 +3,8 @@ server:
   servlet:
     # 应用的访问路径
     context-path: /
+    session:
+      timeout: 0
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8