Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

昨天 69758b26403c3c97ad35c2c76125a1ff36a3e9d0

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkCabinetGridCloudController.java

@@ -27,7 +27,7 @@
@Api(tags = "钥匙柜柜格基本信息表")
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/jkCabinetGrid")
public class JkCabinetGridCloudController extends BaseController {
public class    JkCabinetGridCloudController extends BaseController {

    @Autowired
    private JkCabinetGridService jkCabinetGridService;