Merge remote-tracking branch 'origin/master'

pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/enums/MerchantTypeEnum.java

@@ -10,6 +10,7 @@ public enum MerchantTypeEnum {
     CANTEEN("1", "自营食堂"),
     SUPERMARKET("2", "合作商家"),
     SELF_SUPERMARKET("3", "自营商家"),
+    THIRD_APP("4", "第三方应用"),
     ;
 
     /**