Merge remote-tracking branch 'origin/master'

liujie

2023-09-25 d41358fce9a436d81b9341d06fc1d8f3ddff92ff

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java

@@ -174,7 +174,7 @@
    public Object onChange(Integer oneId) {
        if (oneId == null) return null;
        try {
            TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, oneId));
            TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, oneId));
            QueryWrapper<TCity> query = new QueryWrapper<TCity>().eq("parent_id", one.getId());
            return cityService.list(query);
        }catch (Exception e){