瀏覽代碼

伊宁项目更改相关 智慧客服系统更改为服务经营系统

1037015548@qq.com 1 年之前
父節點
當前提交
4203914087

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java

@@ -321,7 +321,7 @@ public class SysIndexController extends BaseController
         List<UserRelate> leftTwoList = userRelates.stream().filter(x->"智慧管网系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
         List<UserRelate> leftThreeList = userRelates.stream().filter(x->"智慧办公系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
         List<UserRelate> rightOneList = userRelates.stream().filter(x->"智慧生产系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
-        List<UserRelate> rightTwoList = userRelates.stream().filter(x->"智慧客服系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
+        List<UserRelate> rightTwoList = userRelates.stream().filter(x->"服务经营系统".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
         List<UserRelate> rightThreeList = userRelates.stream().filter(x->"水质实验室".equals(x.getDangan().getMenuName())).collect(Collectors.toList());
         mmap.put("leftOneList",leftOneList);
         mmap.put("leftTwoList",leftTwoList);

+ 6 - 6
ruoyi-admin/src/main/resources/application-test.yml

@@ -53,12 +53,12 @@ spring:
                 # 主库数据源 stringtype=unspecified 如果stringtype设置为 unspecified,参数将作为非类型值发送到服务器,并且服务器将尝试推断适当的类型。
                 master:
 #                     url: jdbc:postgresql://119.96.165.176:5432/test_lixing?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
-#                     url: jdbc:postgresql://119.96.165.176:5432/lhk_union_mgr_new?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
-#                     username: postgres
-#                     password: kpr.23417.postgres
-                      url: jdbc:postgresql://140.246.183.164:5432/union_mgr?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
-                      username: postgres
-                      password: kpr.23417.postgres
+                     url: jdbc:postgresql://119.96.165.176:5432/lhk_union_mgr_new?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+                     username: postgres
+                     password: kpr.23417.postgres
+#                      url: jdbc:postgresql://140.246.183.164:5432/union_mgr?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+#                      username: postgres
+#                      password: kpr.23417.postgres
                 # 从库数据源
                 slave:
                     # 从数据源开关/默认关闭

+ 2 - 2
ruoyi-admin/src/main/resources/templates/mainYiningView.html

@@ -149,9 +149,9 @@
 		<div style="display: none" class="rightTwoDiv">
 			<div class="rightTwoTopLine"></div>
 			<div>
-				<img class="rightTwoIcon" alt="[ 智慧客服系统 ]" src="../static/img/yining/icon/智慧客服系统,未选中.png" th:src="@{/img/yining/icon/智慧客服系统,未选中.png}"
+				<img class="rightTwoIcon" alt="[ 服务经营系统 ]" src="../static/img/yining/icon/智慧客服系统,未选中.png" th:src="@{/img/yining/icon/智慧客服系统,未选中.png}"
 					 style="width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;left: 2em">
-				<p style="line-height: 6em;position:absolute;left:6em;display: inline-block;">智慧客服系统</p>
+				<p style="line-height: 6em;position:absolute;left:6em;display: inline-block;">服务经营系统</p>
 			</div>
 			<div class="rightTwoBottomLine"></div>
 		</div>