Merge branch 'test6.9.2' into test6.9.3

@@ -265,12 +265,13 @@ public class ImperfectPublishProcessor implements PublishProcessor<ImperfectOrde
                     iosr.getUid(), iosr.getStorageId(), imageList);
             throw new UfoServiceException(400, "没有上传实物图");
         }
+        /*
         Collections.sort(featureImageList, new Comparator<ImperfectGoodsImage>() {
             @Override
             public int compare(ImperfectGoodsImage o1, ImperfectGoodsImage o2) {
                 return o1.getCode() - o2.getCode();
             }
-        });
+        });*/
         ImperfectGoodsImage defaultIGI = featureImageList.get(0);
         defaultIGI.setIsDefault("Y");
         String defaultGoodsImag = defaultIGI.getImageUrl();

@@ -1381,6 +1381,10 @@ public class ProductServiceImpl implements ProductService {
         if (secondhandInfo != null && StringUtils.isNotBlank(secondhandInfo.getFlawId())) {
             List<SecondhandFlaw> flaws = secondhandFlawMapper.selectByIds(secondhandInfo.getFlawId());
             for (SecondhandFlaw flaw : flaws) {
+                // 其他问题，文字不展示
+                if (flaw.getType() == 200) {
+                    continue;
+                }
                 if (flaw.getType() == 1) {
                     boxInfo.append(",").append(flaw.getName());
                 }