Quellcode durchsuchen

Merge remote-tracking branch 'origin/master' into test

Conflicts:
	src/main/java/com/goafanti/common/controller/WebpageController.java
	src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html
limin vor 7 Jahren
Ursprung
Commit
f409336443

+ 6 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -1283,4 +1283,10 @@ public class WebpageController extends BaseController {
 		return res;
 	}
 	
+	@RequestMapping(value = "/portal/service/safeguarding", method = RequestMethod.GET)
+	public ModelAndView portalServiceSafeguarding(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/portal/service/safeguarding");
+		return modelview;
+	}
+	
 }

+ 6 - 0
src/main/webapp/WEB-INF/views/common.html

@@ -212,6 +212,12 @@
 	                        </ol>
                         </div>
                     </li>                           
+                    <!-- <li th:class="${subM}=='safeguarding'?active:''" >
+                    <div>
+                        <a th:href="@{/portal/service/safeguarding}">知识产权维权</a>
+ 
+                       </div>
+                    </li> -->
  <!--                    <li th:class="${subM}=='protect'?active:''" >
                     <div>
                         <a th:href="@{/portal/service/serviceIndex}">知识产权维权</a>

Datei-Diff unterdrückt, da er zu groß ist
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html