Merge remote-tracking branch 'origin/master'

xiangpei

2024-12-12 2330e34c1d0f8a3c58a729eaee8e9987f612d83d

 system/src/main/java/com/ycl/system/domain/base/AbsEntityOnlyIdAndDeleted.java

@@ -17,8 +17,8 @@

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Integer id;
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @TableField(value = "deleted", fill = FieldFill.INSERT)
    private Integer deleted;