Merge remote-tracking branch 'origin/master'

mybusiness/src/main/resources/templates/business/manager/stationfiremanager/detail.html

@@ -43,13 +43,13 @@
 <script>
     $(function(){
         let json = {
-            id:"[[${id}]]",
-            name:"[[${name}]]",
-            latitude:"[[${latitude}]]",
-            longitude:"[[${longitude}]]",
-            contact_USER:"[[${contactUser}]]",
-            contact_PHONE:"[[${contactPhone}]]",
-            address:"[[${address}]]"
+            id:"[[${tResStationfire.id}]]",
+            name:"[[${tResStationfire.name}]]",
+            latitude:"[[${tResStationfire.latitude}]]",
+            longitude:"[[${tResStationfire.longitude}]]",
+            contact_USER:"[[${tResStationfire.contactUser}]]",
+            contact_PHONE:"[[${tResStationfire.contactPhone}]]",
+            address:"[[${tResStationfire.address}]]"
         };
         console.log(json);
         jczMarker(json);