合并分支 'dxy' 到 'qa'

src/main/java/com/wangxiaolu/export/service/impl/ActivityToFeishuSheetServiceImpl.java

@@ -173,7 +173,7 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
         row.add("APPROVED".equals(rdo.getApproveStatus()) ? "已审核" : "未提交");
 
         //配发试吃品是否有黑鸭口味 R
-        row.add("1".equals(rdo.getHasBlackDuckFlavor()) ? "有" : "无");
+        row.add(rdo.getHasBlackDuckFlavor());
 
         // 配发黑鸭试吃品（根） S
         row.add(rdo.getBlackDuckTastingNum());