Merge branch 'developer' into 'master'

Developer

See merge request !64

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

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