处理合并后的代码冲突

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -799,6 +799,7 @@ public class ProductServiceImpl implements ProductService {
      */
     @Override
     public ResultMap matchNonStandardProduct() {
+        Map<String, Object> map = new HashMap<>();
         final Long uu = SystemSession.getUser().getUserUU();
         final Long enUU = SystemSession.getUser().getEnterprise().getUu();
         ResultMap statusResult = validateProductStatus(enUU);