修改冲突

.env

+APP_ENV=local
+APP_DEBUG=true
+APP_KEY=SomeRandomKey!!!
+
+DB_HOST=192.168.2.232
+DB_DATABASE=liexin_scm_wms
+DB_USERNAME=liexin_scm_wms
+DB_PASSWORD=liexin_scm_wms#zsyM
+DB_PORT=3306
+
+CACHE_DRIVER=memcached
+QUEUE_DRIVER=sync
+
+LOGIN_DOMAIN=user.liexin.net
+ELK_NAME=liexin_scm_wms_api_in_store
+OUT_STORE_SERVICE_URL=http://192.168.2.232:40003
+
+REDIS_HOST=192.168.1.235
+REDIS_PASSWORD=icDb29mLy2s
+REDIS_PORT=6379
+
+REDIS_READ_HOST=192.168.1.237
+REDIS_READ_PASSWORD=icDb29mLy2s
+REDIS_READ_PORT=6379
\ No newline at end of file

scm_wms_common @ b7a43f3b

-Subproject commit 1a8dd43bcfd8b4dac9ddbeb057f947a481007297
+Subproject commit b7a43f3b5c302da482e01750ff029be3d00d069e