Merge remote-tracking branch 'origin/master'

linwei

2024-01-20 cb61acd5c6735788b68e1031e85a0dab244f40aa

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

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

   Integer NUMBER_THREE = 3;

   String RESIDENT = "居民";


}