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

yaowanxin

3 天以前 93ccb6e153b5523a46738bbf6713cd4df25a49e4

 src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java

@@ -31,7 +31,6 @@
     * 员工id
     */
    @ApiModelProperty("员工id")
    @Excel(name = "员工id")
    private Long staffId;

    /**