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

zhaowenyu

2025-10-17 1ab85e9fd1b392d36c6f2b08754249e4574ea4e8

 ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java

@@ -144,8 +144,8 @@
     * 修改服务器状态
     */
    @Override
    public int updateServerStatus(String id) {
        return ardServerInfoMapper.updateServerStatus(id);
    public int updateServerStatus(String id,String status) {
        return ardServerInfoMapper.updateServerStatus(id,status);
    }

    private String getEncryptStr(ArdServerInfo serverInfo, long timeStamp) {