Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0

epmet-gateway/pom.xml

@@ -204,7 +204,7 @@
                 <!--   14、#运营端访问权限控制   -->
                 <gateway.routes.oper-access-server.uri>lb://oper-access-server</gateway.routes.oper-access-server.uri>
                 <!--   15、居民端个人信息            -->
-                <gateway.routes.resi-mine-server.uri>http://resi-mine-server</gateway.routes.resi-mine-server.uri>
+                <gateway.routes.resi-mine-server.uri>lb://resi-mine-server</gateway.routes.resi-mine-server.uri>
             </properties>
         </profile>
     </profiles>

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Date 2020/3/24 11:02
  */
 @RestController
-@RequestMapping("minegrid")
+@RequestMapping("mygrid")
 public class ResiMineGridController {
 	@Autowired
 	private ResiMineGridService resiMineGridService;