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

api-admin/src/main/java/com/glxp/sale/admin/util/PermissionRuleTreeUtils.java

@@ -22,6 +22,7 @@ public class PermissionRuleTreeUtils {
         for (AuthPermissionRule v : authPermissionRuleList) {
             AuthPermissionRuleMergeResponse authPermissionRuleMergeResponse = new AuthPermissionRuleMergeResponse();
             BeanUtils.copyProperties(v, authPermissionRuleMergeResponse);
+            authPermissionRuleMergeResponse.setStatus(Long.valueOf(v.getStatus()));
             if (pid.equals(v.getPid())) {
                 authPermissionRuleMergeResponse.setChildren(merge(authPermissionRuleList, v.getId()));
                 authPermissionRuleMergeResponseList.add(authPermissionRuleMergeResponse);