beauty-erp.git - Gitblit

			@@ -13,7 +13,6 @@
			import com.matrix.core.tools.excl.ExcelVersion;
			import com.matrix.system.common.bean.SysUsers;
			import com.matrix.system.common.bean.SystemDictionary;
			import com.matrix.system.common.constance.AppConstance;
			import com.matrix.system.common.dao.CustomerDataDictionaryDao;
			import com.matrix.system.common.service.SysUsersService;
			import com.matrix.system.common.service.SystemDictionaryService;
			@@ -301,6 +300,9 @@
			if(vipInfo.getShopId()==null){
			vipInfo.setShopId(users.getShopId());
			}
			if(vipInfo.getCompanyId()==null){
			vipInfo.setCompanyId(users.getCompanyId());
			}
			return add(vipInfoService, vipInfo, "会员信息");
			}
			}

			@@ -24,7 +24,7 @@

			<body class="fixed-sidebar full-height-layout gray-bg"
			style="overflow: hidden">
			<div id="wrapper">
			<div id="wrapper" v-cloak>
			<!--左侧导航开始-->
			<nav class="navbar-default navbar-static-side" role="navigation">
			<div class="nav-close">

	zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java	4 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/index.html	2 ●●●●● patch \| view \| raw \| blame \| history