Merge remote-tracking branch 'origin/master'

rule/public_platoon_relate_commission.go

@@ -381,6 +381,9 @@ func DealCommonWealthPunish(engine *xorm.Engine, uid int, reason string) (err er
 		_ = session.Rollback()
 		return
 	}
+	if userPublicPlatoonSetting.SystemPunishReplace != 1 { //TODO::未开启处罚
+		return
+	}
 
 	//2、查询出 `user_public_platoon_relation` 中相关记录 && 将该记录的uid置为 -1
 	params, err := db.UserPublicPlatoonRelationGetOneByParams(engine, map[string]interface{}{