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

diagbotman-service/src/main/java/com/diagbot/facade/ProductOrderFacade.java

@@ -97,7 +97,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
             products = detailMap.get(num);
             for(AuthDetailDTO i : products){
             	i.setAuditStatusMsg(AuditStatusEnum.getName(i.getAuditStatus()));
-            	if(i.getRejectType()!=null){
+            	if(i.getRejectType()!=null&&i.getRejectType()!=-1){
             		i.setRejectReason(NotPassEnum.getName(i.getRejectType()));
             	}
             }

user-service/src/main/java/com/diagbot/dto/UserAndProdutDTO.java

@@ -1,16 +1,10 @@
 package com.diagbot.dto;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import com.diagbot.enums.AccessTypeEnum;
-import com.diagbot.enums.ChargeTypeEnum;
-import com.diagbot.enums.OrganizationTypeEnum;
-
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * 
  * @Description:  用户已开通产品出参