Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/systemZRZ/lpb/bjlp/index.vue

@@ -44,7 +44,8 @@ const store = new Vuex.Store({
         zjlxList: [],
         gyfsList: [],
         hbsm:'',
-        contentWidth:''  //内容区域宽度
+        contentWidth:'',  //内容区域宽度
+        zrzh:'' //自然幢号
     },
     modules: {
         user,