Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/CompanyFunctionTree.jmx

@@ -45,7 +45,7 @@
 							<m:view>function-project-list-company</m:view>
 							<m:view-config></m:view-config>
 						</m:function-definition>
-						<m:icon>iconfont icon-qiyeshezhi</m:icon>
+						<m:icon>iconfont iconxiangmuqingdan1x</m:icon>
 					</m:function-node>
 				</m:children>
 			</m:function-node>
@@ -72,7 +72,7 @@
 							<m:view>function-contract-list-company</m:view>
 							<m:view-config></m:view-config>
 						</m:function-definition>
-						<m:icon>iconfont iconhetongguanli</m:icon>
+						<m:icon>iconfont iconhetongliebiao1x</m:icon>
 					</m:function-node>
 				</m:children>
 			</m:function-node>

backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/StationFunctionTree.jmx

@@ -44,7 +44,7 @@
 							<m:view>function-video-monitoring-station</m:view>
 							<m:view-config></m:view-config>
 						</m:function-definition>
-						<m:icon>iconfont icon-qiyeshezhi</m:icon>
+						<m:icon>iconfont iconshipinjiankong1x</m:icon>
 					</m:function-node>
 				</m:children>
 			</m:function-node>
@@ -71,7 +71,7 @@
 							<m:view>function-market-plan-view</m:view>
 							<m:view-config></m:view-config>
 						</m:function-definition>
-						<m:icon>iconfont icon-qiyeshezhi</m:icon>
+						<m:icon>iconfont iconxiaoshoujihuachakan1x</m:icon>
 					</m:function-node>
 					<m:function-node>
 						<m:id>01b03c7a-0bda-45aa-891f-50b4d655da10</m:id>
@@ -84,7 +84,7 @@
 							<m:view>function-vehicle-station-record</m:view>
 							<m:view-config></m:view-config>
 						</m:function-definition>
-						<m:icon>iconfont icon-qiyeshezhi</m:icon>
+						<m:icon>iconfont iconyunshujiankong1x</m:icon>
 					</m:function-node>
 					<m:function-node>
 						<m:id>9d208f3a-5d03-4f19-ada4-ca1b259cdd6f</m:id>
@@ -97,7 +97,7 @@
 							<m:view>function-sale-record</m:view>
 							<m:view-config></m:view-config>
 						</m:function-definition>
-						<m:icon>iconfont icon-qiyeshezhi</m:icon>
+						<m:icon>iconfont iconxiaoshoutaizhang1x</m:icon>
 					</m:function-node>
 				</m:children>
 			</m:function-node>
@@ -124,7 +124,7 @@
 							<m:view>function-retail-customer-list</m:view>
 							<m:view-config></m:view-config>
 						</m:function-definition>
-						<m:icon>iconfont icon-qiyeshezhi</m:icon>
+						<m:icon>iconfont iconsanhuxinxi1x</m:icon>
 					</m:function-node>
 					<m:function-node>
 						<m:id>4a8ae571-915f-4634-820b-1161cdf136fd</m:id>
@@ -137,7 +137,7 @@
 							<m:view>function-buy-warning</m:view>
 							<m:view-config></m:view-config>
 						</m:function-definition>
-						<m:icon>iconfont icon-qiyeshezhi</m:icon>
+						<m:icon>iconfont iconxiaoshouyujing1x</m:icon>
 					</m:function-node>
 					<m:function-node>
 						<m:id>0f561700-c507-4d38-921b-a31a7e749ed5</m:id>
@@ -150,7 +150,7 @@
 							<m:view>function-buy-warning-setting</m:view>
 							<m:view-config></m:view-config>
 						</m:function-definition>
-						<m:icon>iconfont icon-qiyeshezhi</m:icon>
+						<m:icon>iconfont iconyujingshezhi1x</m:icon>
 					</m:function-node>
 				</m:children>
 			</m:function-node>
@@ -177,7 +177,7 @@
                             <m:view>function-price-trend</m:view>
                             <m:view-config></m:view-config>
                         </m:function-definition>
-                        <m:icon>iconfont icon-qiyeshezhi</m:icon>
+                        <m:icon>iconfont iconjiagehangqing1x</m:icon>
                     </m:function-node>
                     <m:function-node>
                         <m:id>98d7db3e-7ed9-4916-8202-b984f021efe5</m:id>
@@ -190,7 +190,7 @@
                             <m:view>function-modify-price-apply</m:view>
                             <m:view-config></m:view-config>
                         </m:function-definition>
-                        <m:icon>iconfont icon-qiyeshezhi</m:icon>
+                        <m:icon>iconfont icontiaojiashenqing1x</m:icon>
                     </m:function-node>
                 </m:children>
             </m:function-node>
@@ -217,7 +217,7 @@
                             <m:view>function-vehicle-break-rule-record-station</m:view>
                             <m:view-config></m:view-config>
                         </m:function-definition>
-                        <m:icon>iconfont icon-qiyeshezhi</m:icon>
+                        <m:icon>iconfont iconweiguijilu1x</m:icon>
                     </m:function-node>
                     <m:function-node>
                         <m:id>d127b0e2-bedb-4d42-9871-29ec7e1390f4</m:id>
@@ -230,7 +230,7 @@
                             <m:view>function-person-break-rule-record-station</m:view>
                             <m:view-config></m:view-config>
                         </m:function-definition>
-                        <m:icon>iconfont icon-qiyeshezhi</m:icon>
+                        <m:icon>iconfont iconrenyuanweiguijilu1x</m:icon>
                     </m:function-node>
                 </m:children>
             </m:function-node>