1.酒店 2.商户增加酒店类型，部门接口适配酒店

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

@@ -16,6 +16,8 @@ public enum MerchantTypeEnum {
     SELF_SUPERMARKET("3", "自营商家"),
     THIRD_APP("4", "第三方应用"),
     FARMER("5", "共富商城(助农)"),
+    /** 酒店预订收款商户，与食堂/商超隔离 */
+    HOTEL("6", "酒店"),
     ;
 
     /**