美博会活动字段修改

base-module/src/main/java/com/caimei/module/base/entity/vo/ProductVo.java

@@ -168,7 +168,8 @@ public class ProductVo extends Product {
     private Integer shopID;
 
     /**
-     * 美博会活动标识，1活动中，0未活动
+     * 是否参与美博会,1是，0否
      */
-    private Integer actFlag;
+    private String beautyActFlag;
+
 }

product/src/main/resources/com-caimei-module-product/ProductModuleMapper.xml

@@ -14,7 +14,7 @@
         productID, brandID,bigTypeID,smallTypeID, tinyTypeID,productCategory, preferredFlag, selfTypeID, shopID, `name`, aliasName, searchKey, productRemarks,
         normalPrice, price, highestUserLevelPrice, lowestUserLevelPrice, lowestUserLevelID,
         price0, price0Grade, price0Text, price0TextFlag, price1, price1Grade, price1Text,
-        price1TextFlag, price8, price8Grade, price8Text, price8Text as actFlag, price8TextFlag, ladderPriceFlag,
+        price1TextFlag, price8, price8Grade, price8Text, price8Text as beautyActFlag, price8TextFlag, ladderPriceFlag,
         price2, price3, price4, price5, price6, price7, fee, stock, hasSkuFlag, mainImage,
         propertiesInfo, addTime, updateTime, sellNumber, weekSellNumber, beforeValidFlag,
         validFlag, favoriteTimes, commentScore, commentTimes, selfRecommendFlag, sysRecommendFlag,