合并分支 'dxy' 到 'qa'

src/main/java/com/sfa/operation/config/OssConfigProperties.java

@@ -54,7 +54,7 @@ public class OssConfigProperties{
         /**
          * 静态网站访问地址前缀
          */
-        private static final String END_POINT_PREFIX = "https://";
+        private static final String END_POINT_PREFIX = "https://oss-";
 
         /**
          * 静态网站访问地址后缀

src/main/java/com/sfa/operation/pojo/sales/request/SalesApRequest.java

@@ -69,6 +69,7 @@ public class SalesApRequest {
      *  3.零食陈列 ：SNACK_DISPLAY_EXPORT
      *  4.三米两秒 ：THREE_METER_TWO_SECONDS_EXPORT
      *  5.六小金刚 ：SIX_KINGkONG_EXPORT
+     *  6.档期陈列 : PROMOTION_DISPLAY_EXPORT
      */
     private String pageType;