Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/resources/application-qa.properties

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1989,6 +1989,9 @@ public class OrderAdapter {
         if (ActivityTypeEnum.TYPE_104.getCode().equals(activityType)) {
             return OldOrderAccountType.XY_DISCOUNT;
         }
+        if (ActivityTypeEnum.TYPE_14.getCode().equals(activityType)) {
+            return OldOrderAccountType.FULL_DISTRIBUTION_FEE;
+        }
         return OldOrderAccountType.BUYM_SENDN;
     }