Merge pull request #1 from linlinjava/master

update

Merge pull request #1 from linlinjava/master
update
b68151cb · Menethil · GitHub · 126d027a · 02679509 · b68151cb
Unverified Commit b68151cb authored Jul 13, 2018 by Menethil Committed by GitHub Jul 13, 2018
--- a/litemall-os-api/src/main/resources/application-prod.properties
+++ b/litemall-os-api/src/main/resources/application-prod.properties
--- a/litemall-wx-api/pom.xml
+++ b/litemall-wx-api/pom.xml
--- a/litemall-wx-api/src/main/docker/Dockerfile
+++ b/litemall-wx-api/src/main/docker/Dockerfile
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java
--- a/litemall-wx-api/src/main/resources/application-dep.properties
+++ b/litemall-wx-api/src/main/resources/application-dep.properties
--- a/litemall-wx-api/src/main/resources/application-dev.properties
+++ b/litemall-wx-api/src/main/resources/application-dev.properties
--- a/litemall-wx-api/src/main/resources/application-docker.yml
+++ b/litemall-wx-api/src/main/resources/application-docker.yml
--- a/litemall-wx-api/src/main/resources/application-prod.properties
+++ b/litemall-wx-api/src/main/resources/application-prod.properties
--- a/litemall-wx-api/src/main/resources/application.properties
+++ b/litemall-wx-api/src/main/resources/application.properties
--- a/litemall-wx/app.json
+++ b/litemall-wx/app.json
--- a/litemall-wx/pages/brand/brand.wxml
+++ b/litemall-wx/pages/brand/brand.wxml
--- a/litemall-wx/pages/brandDetail/brandDetail.wxml
+++ b/litemall-wx/pages/brandDetail/brandDetail.wxml