Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java

@@ -145,7 +145,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
                             siteBiz.insertSelective(site);
                             siteId=site.getId();
                         }else {
-                            siteBiz.updateById(site);
+                            siteBiz.updateSelectiveById(site);
                             siteIds.add(siteId);
                         }
                         if(site.getType()==0){
@@ -167,7 +167,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
                         if(tagId==null||tagId==0){
                             tagBiz.insertSelective(tag);
                         }else {
-                            tagBiz.updateById(tag);
+                            tagBiz.updateSelectiveById(tag);
                             tagIds.add(tagId);
                         }
                     }
@@ -215,7 +215,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
                             speBiz.insertSelective(spePrice);
                             priceId=spePrice.getId();
                         }else {
-                            speBiz.updateById(spePrice);
+                            speBiz.updateSelectiveById(spePrice);
                             priceIds.add(priceId);
                         }
                         prices.add(priceId);

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodVerificationMapper.java

@@ -29,7 +29,7 @@ public interface TourGoodVerificationMapper extends Mapper<TourGoodVerification>
      * @param tourGoodVerification
      * @return
      */
-    @Insert("insert into tour_good_verification(`spe_id`,`site_id`,`good_id`)values(#{speId} ,#{siteId} ,#{goodId}) where `spe_id`<>#{spId} and `site_id`<>#{siteId} and `good_id`<>#{goodId}")
+    @Insert("insert into tour_good_verification(`spe_id`,`site_id`,`good_id`)values(#{speId} ,#{siteId} ,#{goodId}) where `spe_id`<>#{speId} and `site_id`<>#{siteId} and `good_id`<>#{goodId}")
     int insertTourGoodVerification(TourGoodVerification tourGoodVerification);
 
     /**