Merge remote-tracking branch 'origin/master'

rule/block_green_chain_settlement.go

@@ -315,7 +315,7 @@ func statisticsAndDistributeCoinForAirdrop(session *xorm.Session, mid string, pu
 
 	//1、查询出所有需要空投的用户
 	var userList []*model.BlockGreenChainCustomUserAirdrop
-	totalUser, err := session.Table("block_green_chain_custom_user_airdrop").Where("1 =1 ").FindAndCount(&userList)
+	totalUser, err := session.Table("block_green_chain_custom_user_airdrop").Where("airdrop_frequency > 0").FindAndCount(&userList)
 	if err != nil {
 		return err, unassignedTotalCoinValue
 	}