zq-erp/src/main/resources/templates/views/admin/index.html
@@ -37,11 +37,7 @@ <a id="dLabel" data-toggle="dropdown" class="dropdown-toggle" href="#" aria-haspopup="true" aria-expanded="true"> <span class="clear" style="height: auto;"> <span class="block m-t-xs"> <<<<<<< HEAD <strong class="font-bold">阿尔法云管理系统</strong> ======= <strong class="font-bold">{{systemName}}</strong> >>>>>>> feature/订单服务单代码改造 </span> </span> </a>
