Merge remote-tracking branch 'origin/master'

lin

2024-03-11 c5a0d277347f9ecaaf934b648b6edf5b9119516b

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

@@ -88,5 +88,11 @@

   Integer NUMBER_THREE = 3;

   Integer NUMBER_FOUR = 4;

   Integer NUMBER_EIGHT = 8;

   String RESIDENT = "居民";


}