Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

 src/main/java/org/springblade/modules/performance/entity/Performance.java

@@ -81,6 +81,17 @@
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   private Date time;
   private String departmentid;
   /**
    * 保安身份证号码
    */
   private String cardid;

   /**
    * 服务公司名称
    */
   @TableField("department_name")
   private String departmentName;
   private String jurisdiction;


}