Merge branch 'master' into dev

324c8da3 · linlinjava · GitHub · 693cf5cd · 4c46da9b · 324c8da3
Unverified Commit 324c8da3 authored Dec 29, 2019 by linlinjava Committed by GitHub Dec 29, 2019
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallRegion.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallRegion.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallRegionExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallRegionExample.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallRole.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallRole.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallRoleExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallRoleExample.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSearchHistory.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSearchHistory.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSearchHistoryExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSearchHistoryExample.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorage.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorage.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorageExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorageExample.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSystem.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSystem.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSystemExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSystemExample.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserExample.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserFormid.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserFormid.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserFormidExample.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserFormidExample.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/CouponVerifyService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/CouponVerifyService.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallBrandService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallBrandService.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCartService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCartService.java
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCollectService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCollectService.java