修复mybatis generator重复生成mapper.xml内容的问题

mall-mbg/src/main/resources/com/macro/mall/mapper/CmsHelpCategoryMapper.xml

@@ -149,7 +149,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.CmsHelpCategoryExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.CmsHelpCategoryExample" resultType="java.lang.Long">
     select count(*) from cms_help_category
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/CmsHelpMapper.xml

@@ -188,7 +188,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.CmsHelpExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.CmsHelpExample" resultType="java.lang.Long">
     select count(*) from cms_help
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/CmsMemberReportMapper.xml

@@ -156,7 +156,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.CmsMemberReportExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.CmsMemberReportExample" resultType="java.lang.Long">
     select count(*) from cms_member_report
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/CmsPrefrenceAreaMapper.xml

@@ -172,7 +172,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.CmsPrefrenceAreaExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.CmsPrefrenceAreaExample" resultType="java.lang.Long">
     select count(*) from cms_prefrence_area
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/CmsPrefrenceAreaProductRelationMapper.xml

@@ -126,7 +126,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.CmsPrefrenceAreaProductRelationExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.CmsPrefrenceAreaProductRelationExample" resultType="java.lang.Long">
     select count(*) from cms_prefrence_area_product_relation
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/CmsSubjectCategoryMapper.xml

@@ -149,7 +149,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.CmsSubjectCategoryExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.CmsSubjectCategoryExample" resultType="java.lang.Long">
     select count(*) from cms_subject_category
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/CmsSubjectCommentMapper.xml

@@ -158,7 +158,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.CmsSubjectCommentExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.CmsSubjectCommentExample" resultType="java.lang.Long">
     select count(*) from cms_subject_comment
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/CmsSubjectMapper.xml

@@ -251,7 +251,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.CmsSubjectExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.CmsSubjectExample" resultType="java.lang.Long">
     select count(*) from cms_subject
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/CmsSubjectProductRelationMapper.xml

@@ -126,7 +126,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.CmsSubjectProductRelationExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.CmsSubjectProductRelationExample" resultType="java.lang.Long">
     select count(*) from cms_subject_product_relation
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/CmsTopicCategoryMapper.xml

@@ -149,7 +149,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.CmsTopicCategoryExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.CmsTopicCategoryExample" resultType="java.lang.Long">
     select count(*) from cms_topic_category
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/CmsTopicCommentMapper.xml

@@ -158,7 +158,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.CmsTopicCommentExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.CmsTopicCommentExample" resultType="java.lang.Long">
     select count(*) from cms_topic_comment
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/CmsTopicMapper.xml

@@ -219,7 +219,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.CmsTopicExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.CmsTopicExample" resultType="java.lang.Long">
     select count(*) from cms_topic
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/OmsCartItemMapper.xml

@@ -266,7 +266,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.OmsCartItemExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.OmsCartItemExample" resultType="java.lang.Long">
     select count(*) from oms_cart_item
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/OmsCompanyAddressMapper.xml

@@ -182,7 +182,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.OmsCompanyAddressExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.OmsCompanyAddressExample" resultType="java.lang.Long">
     select count(*) from oms_company_address
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderItemMapper.xml

@@ -290,7 +290,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.OmsOrderItemExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.OmsOrderItemExample" resultType="java.lang.Long">
     select count(*) from oms_order_item
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderMapper.xml

@@ -447,7 +447,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.OmsOrderExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.OmsOrderExample" resultType="java.lang.Long">
     select count(*) from oms_order
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderOperateHistoryMapper.xml

@@ -149,7 +149,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.OmsOrderOperateHistoryExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.OmsOrderOperateHistoryExample" resultType="java.lang.Long">
     select count(*) from oms_order_operate_history
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderReturnApplyMapper.xml

@@ -313,7 +313,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.OmsOrderReturnApplyExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.OmsOrderReturnApplyExample" resultType="java.lang.Long">
     select count(*) from oms_order_return_apply
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderReturnReasonMapper.xml

@@ -142,7 +142,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.OmsOrderReturnReasonExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.OmsOrderReturnReasonExample" resultType="java.lang.Long">
     select count(*) from oms_order_return_reason
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderSettingMapper.xml

@@ -152,7 +152,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.OmsOrderSettingExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.OmsOrderSettingExample" resultType="java.lang.Long">
     select count(*) from oms_order_setting
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsAlbumMapper.xml

@@ -149,7 +149,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsAlbumExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsAlbumExample" resultType="java.lang.Long">
     select count(*) from pms_album
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsAlbumPicMapper.xml

@@ -126,7 +126,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsAlbumPicExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsAlbumPicExample" resultType="java.lang.Long">
     select count(*) from pms_album_pic
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsBrandMapper.xml

@@ -212,7 +212,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsBrandExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsBrandExample" resultType="java.lang.Long">
     select count(*) from pms_brand
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsCommentMapper.xml

@@ -242,7 +242,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsCommentExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsCommentExample" resultType="java.lang.Long">
     select count(*) from pms_comment
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsCommentReplayMapper.xml

@@ -158,7 +158,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsCommentReplayExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsCommentReplayExample" resultType="java.lang.Long">
     select count(*) from pms_comment_replay
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsFeightTemplateMapper.xml

@@ -165,7 +165,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsFeightTemplateExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsFeightTemplateExample" resultType="java.lang.Long">
     select count(*) from pms_feight_template
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsMemberPriceMapper.xml

@@ -142,7 +142,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsMemberPriceExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsMemberPriceExample" resultType="java.lang.Long">
     select count(*) from pms_member_price
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductAttributeCategoryMapper.xml

@@ -135,7 +135,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductAttributeCategoryExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductAttributeCategoryExample" resultType="java.lang.Long">
     select count(*) from pms_product_attribute_category
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductAttributeMapper.xml

@@ -198,7 +198,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductAttributeExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductAttributeExample" resultType="java.lang.Long">
     select count(*) from pms_product_attribute
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductAttributeValueMapper.xml

@@ -135,7 +135,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductAttributeValueExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductAttributeValueExample" resultType="java.lang.Long">
     select count(*) from pms_product_attribute_value
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductCategoryAttributeRelationMapper.xml

@@ -128,7 +128,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductCategoryAttributeRelationExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductCategoryAttributeRelationExample" resultType="java.lang.Long">
     select count(*) from pms_product_category_attribute_relation
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductCategoryMapper.xml

@@ -219,7 +219,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductCategoryExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductCategoryExample" resultType="java.lang.Long">
     select count(*) from pms_product_category
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductFullReductionMapper.xml

@@ -135,7 +135,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductFullReductionExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductFullReductionExample" resultType="java.lang.Long">
     select count(*) from pms_product_full_reduction
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductLadderMapper.xml

@@ -142,7 +142,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductLadderExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductLadderExample" resultType="java.lang.Long">
     select count(*) from pms_product_ladder
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductMapper.xml

@@ -453,7 +453,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductExample" resultType="java.lang.Long">
     select count(*) from pms_product
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductOperateLogMapper.xml

@@ -196,7 +196,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductOperateLogExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductOperateLogExample" resultType="java.lang.Long">
     select count(*) from pms_product_operate_log
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductVertifyRecordMapper.xml

@@ -149,7 +149,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductVertifyRecordExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsProductVertifyRecordExample" resultType="java.lang.Long">
     select count(*) from pms_product_vertify_record
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsSkuStockMapper.xml

@@ -203,7 +203,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.PmsSkuStockExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.PmsSkuStockExample" resultType="java.lang.Long">
     select count(*) from pms_sku_stock
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsCouponHistoryMapper.xml

@@ -189,7 +189,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.SmsCouponHistoryExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsCouponHistoryExample" resultType="java.lang.Long">
     select count(*) from sms_coupon_history
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsCouponMapper.xml

@@ -242,7 +242,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.SmsCouponExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsCouponExample" resultType="java.lang.Long">
     select count(*) from sms_coupon
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsCouponProductCategoryRelationMapper.xml

@@ -142,7 +142,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.SmsCouponProductCategoryRelationExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsCouponProductCategoryRelationExample" resultType="java.lang.Long">
     select count(*) from sms_coupon_product_category_relation
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsCouponProductRelationMapper.xml

@@ -142,7 +142,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.SmsCouponProductRelationExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsCouponProductRelationExample" resultType="java.lang.Long">
     select count(*) from sms_coupon_product_relation
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsFlashPromotionLogMapper.xml

@@ -158,7 +158,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.SmsFlashPromotionLogExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsFlashPromotionLogExample" resultType="java.lang.Long">
     select count(*) from sms_flash_promotion_log
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsFlashPromotionMapper.xml

@@ -149,7 +149,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.SmsFlashPromotionExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsFlashPromotionExample" resultType="java.lang.Long">
     select count(*) from sms_flash_promotion
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsFlashPromotionProductRelationMapper.xml

@@ -166,7 +166,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.SmsFlashPromotionProductRelationExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsFlashPromotionProductRelationExample" resultType="java.lang.Long">
     select count(*) from sms_flash_promotion_product_relation
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsFlashPromotionSessionMapper.xml

@@ -149,7 +149,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.SmsFlashPromotionSessionExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsFlashPromotionSessionExample" resultType="java.lang.Long">
     select count(*) from sms_flash_promotion_session
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsHomeAdvertiseMapper.xml

@@ -196,7 +196,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.SmsHomeAdvertiseExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsHomeAdvertiseExample" resultType="java.lang.Long">
     select count(*) from sms_home_advertise
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsHomeBrandMapper.xml

@@ -142,7 +142,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.SmsHomeBrandExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsHomeBrandExample" resultType="java.lang.Long">
     select count(*) from sms_home_brand
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsHomeNewProductMapper.xml

@@ -142,7 +142,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.SmsHomeNewProductExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsHomeNewProductExample" resultType="java.lang.Long">
     select count(*) from sms_home_new_product
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsHomeRecommendProductMapper.xml

@@ -142,7 +142,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.SmsHomeRecommendProductExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsHomeRecommendProductExample" resultType="java.lang.Long">
     select count(*) from sms_home_recommend_product
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/SmsHomeRecommendSubjectMapper.xml

@@ -142,7 +142,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.SmsHomeRecommendSubjectExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.SmsHomeRecommendSubjectExample" resultType="java.lang.Long">
     select count(*) from sms_home_recommend_subject
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsAdminLoginLogMapper.xml

@@ -149,7 +149,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsAdminLoginLogExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsAdminLoginLogExample" resultType="java.lang.Long">
     select count(*) from ums_admin_login_log
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsAdminMapper.xml

@@ -181,7 +181,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsAdminExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsAdminExample" resultType="java.lang.Long">
     select count(*) from ums_admin
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsAdminPermissionRelationMapper.xml

@@ -135,7 +135,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsAdminPermissionRelationExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsAdminPermissionRelationExample" resultType="java.lang.Long">
     select count(*) from ums_admin_permission_relation
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsAdminRoleRelationMapper.xml

@@ -126,7 +126,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsAdminRoleRelationExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsAdminRoleRelationExample" resultType="java.lang.Long">
     select count(*) from ums_admin_role_relation
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsGrowthChangeHistoryMapper.xml

@@ -166,7 +166,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsGrowthChangeHistoryExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsGrowthChangeHistoryExample" resultType="java.lang.Long">
     select count(*) from ums_growth_change_history
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsIntegrationChangeHistoryMapper.xml

@@ -166,7 +166,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsIntegrationChangeHistoryExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsIntegrationChangeHistoryExample" resultType="java.lang.Long">
     select count(*) from ums_integration_change_history
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsIntegrationConsumeSettingMapper.xml

@@ -142,7 +142,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsIntegrationConsumeSettingExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsIntegrationConsumeSettingExample" resultType="java.lang.Long">
     select count(*) from ums_integration_consume_setting
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberLevelMapper.xml

@@ -206,7 +206,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberLevelExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberLevelExample" resultType="java.lang.Long">
     select count(*) from ums_member_level
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberLoginLogMapper.xml

@@ -158,7 +158,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberLoginLogExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberLoginLogExample" resultType="java.lang.Long">
     select count(*) from ums_member_login_log
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberMapper.xml

@@ -250,7 +250,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberExample" resultType="java.lang.Long">
     select count(*) from ums_member
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberMemberTagRelationMapper.xml

@@ -126,7 +126,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberMemberTagRelationExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberMemberTagRelationExample" resultType="java.lang.Long">
     select count(*) from ums_member_member_tag_relation
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberProductCategoryRelationMapper.xml

@@ -126,7 +126,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberProductCategoryRelationExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberProductCategoryRelationExample" resultType="java.lang.Long">
     select count(*) from ums_member_product_category_relation
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberReceiveAddressMapper.xml

@@ -182,7 +182,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberReceiveAddressExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberReceiveAddressExample" resultType="java.lang.Long">
     select count(*) from ums_member_receive_address
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberRuleSettingMapper.xml

@@ -159,7 +159,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberRuleSettingExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberRuleSettingExample" resultType="java.lang.Long">
     select count(*) from ums_member_rule_setting
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberStatisticsInfoMapper.xml

@@ -229,7 +229,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberStatisticsInfoExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberStatisticsInfoExample" resultType="java.lang.Long">
     select count(*) from ums_member_statistics_info
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberTagMapper.xml

@@ -135,7 +135,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberTagExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberTagExample" resultType="java.lang.Long">
     select count(*) from ums_member_tag
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberTaskMapper.xml

@@ -142,7 +142,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberTaskExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberTaskExample" resultType="java.lang.Long">
     select count(*) from ums_member_task
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsPermissionMapper.xml

@@ -179,7 +179,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsPermissionExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsPermissionExample" resultType="java.lang.Long">
     select count(*) from ums_permission
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsRoleMapper.xml

@@ -158,7 +158,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsRoleExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsRoleExample" resultType="java.lang.Long">
     select count(*) from ums_role
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsRolePermissionRelationMapper.xml

@@ -126,7 +126,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.macro.mall.model.UmsRolePermissionRelationExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.macro.mall.model.UmsRolePermissionRelationExample" resultType="java.lang.Long">
     select count(*) from ums_role_permission_relation
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />

mall-mbg/src/main/resources/generatorConfig.xml

@@ -13,6 +13,8 @@
         <plugin type="org.mybatis.generator.plugins.SerializablePlugin"/>
         <!-- 为生成的Java模型创建一个toString方法 -->
         <plugin type="org.mybatis.generator.plugins.ToStringPlugin"/>
+        <!--生成mapper.xml时覆盖原文件-->
+        <plugin type="org.mybatis.generator.plugins.UnmergeableXmlMappersPlugin" />
         <commentGenerator type="com.macro.mall.CommentGenerator">
             <!-- 是否去除自动生成的注释 true：是 ： false:否 -->
             <property name="suppressAllComments" value="true"/>