Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundsVo.java

@@ -111,7 +111,7 @@ public class KylinOrderRefundsVo implements Serializable {
     private List<KylinOrderRefundEntitiesVo> orderRefundEntitiesVoList;
     private List<KylinOrderRefundPicVo> orderRefundPicVos;
 
-    public void setStatusName(Integer status){
+    public void setStatus(Integer status){
         try {
             this.status = status;
             switch (status) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java

@@ -365,7 +365,6 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         }
 
         KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
-        kylinOrderRefundsVo.setStatusName(data.getStatus());
         kylinOrderRefundsVo.setEntities(entities);
         BeanUtils.copyProperties(data, kylinOrderRefundsVo);