Merge remote-tracking branch 'origin/master'

guoshilong

2024-02-02 d7e498f5e1f13e37df52ebd08c98e8a833b9c450

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

@@ -88,6 +88,10 @@

   Integer NUMBER_THREE = 3;

   Integer NUMBER_FOUR = 4;

   Integer NUMBER_EIGHT = 8;

   String RESIDENT = "居民";