Merge remote-tracking branch 'origin/jc' into jc

guoshilong

2023-12-04 f6fad9857bddebb5bfaad2074e4be73b9b5abc62

 src/main/java/org/springblade/modules/equipage/excel/GunExcel.java

@@ -81,6 +81,14 @@


   /**
    * 责任人
    */
   @ColumnWidth(20)
   @ExcelProperty("责任人身份证号码")
   private String cardNo;


   /**
    * 枪型
    */
   @ColumnWidth(10)