Merge remote-tracking branch 'origin/master'

lin

2024-03-21 98222128889b7943d02bfa6a9bd09782cb2bfbcb

 src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -92,6 +92,8 @@

   Integer NUMBER_EIGHT = 8;

   Integer NUMBER_SEVEN = 7;

   String RESIDENT = "居民";