fix conflict

Signed-off-by: Miles Zhang <[email protected]>
nervosnetwork · Dec 25, 2024 · 408a32c · 408a32c
2 parents d0bfc41 + cf5ef70
commit 408a32c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/serializers/daily_statistic_serializer.rb b/app/serializers/daily_statistic_serializer.rb
@@ -138,4 +138,8 @@ class DailyStatisticSerializer
   attribute :knowledge_size, if: Proc.new { |_record, params|
     params.present? && params[:indicator].include?("knowledge_size")
   }
+
+  attribute :activity_address_contract_distribution, if: Proc.new { |_record, params|
+    params.present? && params[:indicator].include?("activity_address_contract_distribution")
+  }
 end
diff --git a/db/structure.sql b/db/structure.sql
@@ -6306,11 +6306,8 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20241212022531'),
 ('20241213053309'),
 ('20241218085721'),
-<<<<<<< HEAD
 ('20241223023654'),
 ('20241223060331'),
-=======
->>>>>>> issue-804
 ('20241225045757');