Merge branch 'master' into feat/multi-tenant
Resolve conflicts by accepting master changes for: - Jenkinsfile (CI/CD release/next branch support) - OrderCodeGenerator (Redis seq sync fix) - OrderCodeGeneratorTest (updated tests) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -26,6 +26,9 @@ public class BadgeStatusRespDTO {
|
||||
@Schema(description = "设备编码", example = "badge_001")
|
||||
private String deviceKey;
|
||||
|
||||
@Schema(description = "设备昵称(用户可读的显示名称)", example = "张三的工牌")
|
||||
private String nickname;
|
||||
|
||||
@Schema(description = "状态(IDLE/BUSY/OFFLINE/PAUSED)", example = "IDLE")
|
||||
private String status;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user