Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

@@ -350,7 +350,7 @@ public class StoreController extends WebBaseController{
 			return true;
 		}
 		EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(store.getEnterpriseId());
-		if(enterprise == null){
+		if(enterprise == null || enterprise.getExpireTime() == null){
 			return true;
 		}
 		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis()){