From 179b39401c406579a0d10c442a665aeb2802e931 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 20 五月 2019 09:17:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java
similarity index 99%
rename from fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java
rename to fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java
index 5285b34..bf533cc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java
@@ -1,4 +1,4 @@
-package com.yeshi.fanli.controller.client;
+package com.yeshi.fanli.controller.client.v1;
 
 import java.io.PrintWriter;
 import java.math.BigDecimal;

--
Gitblit v1.8.0