Merge remote-tracking branch 'origin/master'

lin

2024-03-16 6195b0dadf2a2d9d433d9059a20a53b702297bee

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

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

   Integer NUMBER_EIGHT = 8;

   Integer NUMBER_SEVEN = 7;

   String RESIDENT = "居民";