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

zhaoxiaohao

2020-07-15 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/config.js

@@ -3,7 +3,7 @@
     * 用于动态切换环境地址
     */
    //默认地址
    var defUrl = 'http://192.168.1.103:8888/';
    var defUrl = 'http://182.92.99.224:8887/';
    //当前环境的api地址
    var apiUrl;
    try{