Merge remote-tracking branch 'origin/master'

rk

18 小时以前 55642c818f14bf8cf52c98e6858014bd8dc3d3a7

 server/services/src/main/java/com/doumee/core/annotation/LoginShopRequired.java

@@ -1,4 +1,4 @@
package com.doumee.config.annotation;
package com.doumee.core.annotation;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;