Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

 screen-api/src/main/java/com/moral/api/entity/SpecialDevice.java

@@ -12,11 +12,11 @@

/**
 * <p>
 * 
 *
 * </p>
 *
 * @author moral
 * @since 2021-08-18
 * @since 2021-08-11
 */
@Data
@EqualsAndHashCode(callSuper = false)