Merge remote-tracking branch 'origin/master'

linwei

2024-01-19 f3dac2f82e3a6e2836a15a66df4bafd4f5cfd733

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

@@ -88,5 +88,7 @@

   Integer NUMBER_THREE = 3;

   String RESIDENT = "居民";


}