Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 d643b843cc794d8f59c4ecd04bda2b9d35e5b22a

 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/TOperatorCity.java

@@ -25,7 +25,7 @@
@TableName("t_operator_city")
public class TOperatorCity extends Model<TOperatorCity> {

    private static final long serialVersionUID=1L;
    private static final long serialVersionUID = 1L;

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