Merge branch 'security_20240424'

zhoushihao

2024-04-28 48be263891d34bfac0417c1e8d047fef673f0900

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java

@@ -22,8 +22,11 @@

    private static final long serialVersionUID = 1L;

    @Id
    /**
     * id
     */
    @TableId(value = "id", type = IdType.AUTO)
    @Id
    private Long id;

    /**