Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/kiisoo/ic/activity/controller/WebAppActivityController.java

@@ -101,7 +101,7 @@ public class WebAppActivityController extends BaseController {
              */
             PmnPromotionSrc up = new PmnPromotionSrc();
             up.setStatus(2L);
-            pmnPromotionSrcService.update(up, Wrappers.<PmnPromotionSrc>lambdaQuery().eq(PmnPromotionSrc::getInstanceId, instanceId).notIn(PmnPromotionSrc::getPromoterId, staffs.stream().map(PoiStoreStaff::getUserId).collect(Collectors.toList())).notIn(PmnPromotionSrc::getType, staffs.stream().map(PoiStoreStaff::getType).collect(Collectors.toList())));
+            pmnPromotionSrcService.update(up, Wrappers.<PmnPromotionSrc>lambdaQuery().eq(PmnPromotionSrc::getInstanceId, instanceId).notIn(PmnPromotionSrc::getPromoterId, staffs.stream().map(PoiStoreStaff::getUserId).collect(Collectors.toList())).eq(PmnPromotionSrc::getType, 1));
             //
             Map<String, Object> ret = new HashMap<>();
             ret.put("success", success);