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

zengh

2021-01-29 636e651b6d537f6533b731947c7f7447a8ce12db

 public/map/env.js

File was renamed from public/map/views/map/env.js
@@ -74,7 +74,7 @@
    return uuid;
}

var baseUrl = getIndexUrl("/map/views/map");
var baseUrl = getIndexUrl("/map");
// var baseUrl = getIndexUrl("/views/map");
//var baseUrl = getIndexUrl("/wnga/Police");
dojoConfig = {