Merge branch 'dev1'

Administrator

2018-12-06 1770eb0a01b3f2ef92f416b67d25160d3ced9625

Merge branch 'dev1'

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserGoodsStorageController.java

@@ -81,7 +81,7 @@
        }



        if (uid == null) {

            out.print(JsonUtil.loadFalseResult("用户未登陆"));

            out.print(JsonUtil.loadFalseResult("用户未登录"));

        }



        try {

@@ -122,7 +122,7 @@
        }

        

        if (uid == null) {

            out.print(JsonUtil.loadFalseResult("用户未登陆"));

            out.print(JsonUtil.loadFalseResult("用户未登录"));

            return;

        }



@@ -161,7 +161,7 @@
        }

        

        if (uid == null) {

            out.print(JsonUtil.loadFalseResult("用户未登陆"));

            out.print(JsonUtil.loadFalseResult("用户未登录"));

            return;

        }