Merge remote-tracking branch 'origin/main'

bonus-base/src/main/java/com/bonus/base/core/config/SwaggerConfig.java

@@ -113,7 +113,7 @@ public class SwaggerConfig
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题
-                .title("标题：若依管理系统_接口文档")
+                .title("标题：博诺思_接口文档")
                 // 描述
                 .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
                 // 作者信息

bonus-business/src/main/resources/mapper/business/TbProductMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getProductOnCz" resultType="java.lang.Integer">
         select  count(1)
         from tb_promotion_material_product
-        where product_id=#{id}
+        where product_id=#{id}  and  del_flag=0
 
     </select>