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

puzhibing

2024-03-01 e0ec0a20cb943b4ee92c45b64f02b007a003b0ba

 cloud-server-other/src/main/java/com/dsh/other/entity/Protocol.java

@@ -13,7 +13,7 @@
 * @date 2023/6/14 14:59
 */
@Data
@TableName
@TableName("t_protocol")
public class Protocol {
    /**
     * 主键