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-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallCollectMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallCollectMapper.xml
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallCommentMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallCommentMapper.xml
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallCouponMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallCouponMapper.xml
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsAttributeMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsAttributeMapper.xml
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsMapper.xml
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsSpecificationMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsSpecificationMapper.xml
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallKeywordMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallKeywordMapper.xml
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderGoodsMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderGoodsMapper.xml
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderMapper.xml
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallProductMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallProductMapper.xml
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallSearchHistoryMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallSearchHistoryMapper.xml
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallTopicMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallTopicMapper.xml
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserCouponMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserCouponMapper.xml
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml
--- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/StatMapper.xml
+++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/StatMapper.xml
--- a/litemall-db/src/test/java/org/linlinjava/litemall/db/StatMapperTest.java
+++ b/litemall-db/src/test/java/org/linlinjava/litemall/db/StatMapperTest.java
--- a/litemall-os-api/pom.xml
+++ b/litemall-os-api/pom.xml
--- a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/OsStorageController.java
+++ b/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/OsStorageController.java
--- a/litemall-os-api/src/main/resources/application-dep.properties
+++ b/litemall-os-api/src/main/resources/application-dep.properties
--- a/litemall-os-api/src/main/resources/application-dev.properties
+++ b/litemall-os-api/src/main/resources/application-dev.properties