Merge branch 'feature/1219_opt' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/AlbumCategoryController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
 @Slf4j
 @Validated
 @RestController
-@RequestMapping("/albumCategory")
+@RequestMapping("${app-config.url.admin:}/albumCategory")
 @Api(tags = "机构专辑分类")
 public class AlbumCategoryController {
 

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/EDiscountType.java

@@ -5,6 +5,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
 
 public enum EDiscountType implements BaseEnum<String, EDiscountType> {
 
+    // 优惠券 COUPON 活动 ACTIVATY 畅学卡 DISCOUNT
     COUPON("优惠券"),
     ACTIVATY("活动"),
     DISCOUNT("畅学卡"),