Merge remote-tracking branch 'origin/master'

doum

昨天 f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e

 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;