Merge branch 'master' into pjfk

# Conflicts:
#	pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java
#	pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java

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

@@ -145,4 +145,8 @@ public interface CacheConstants {
     String THIRDPARTY_ZY_SELF_TOKEN = "thirdparty:zy:self_token:";
 
     /* ************************************* end 第三方对接相关 end ************************************* */
+
+
+    /** mfa */
+    String SMS_CODE_KEY="sms_code:";
 }

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", "第三方应用"),
     ;
 
     /**