Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

fengxiang

2018-07-31 a2bd66a59a51c84100474d1ce3eb79d7ed3b754e

 tsconfig.json

@@ -17,10 +17,16 @@
    ],
    "baseUrl": "src/",
    "paths": {
      "@shared": [ "app/shared" ],
      "@shared/*": [ "app/shared/*" ],
      "@core": [ "app/core/" ],
      "@core/*": [ "app/core/*" ]
        "@shared": [ "app/shared" ],
        "@shared/*": [ "app/shared/*" ],
        "@core": [ "app/core/" ],
        "@core/*": [ "app/core/*" ],
        "@testing": [ "testing/" ],
        "@testing/*": [ "testing/*" ],
        "@env": [ "environments/" ],
        "@env/*": [ "environments/*" ],
        "@business": [ "app/business" ],
        "@business/*": [ "app/business/*" ]
    }
  }
}