Merge remote-tracking branch 'origin/dev' into dev

docs/sql/init.sql

@@ -142,7 +142,6 @@ CREATE TABLE `t_mch_info` (
         `contact_name` VARCHAR(32) COMMENT '联系人姓名',
         `contact_tel` VARCHAR(32) COMMENT '联系人手机号',
         `contact_email` VARCHAR(32) COMMENT '联系人邮箱',
-        `private_key` VARCHAR(128) COMMENT '私钥',
         `state` TINYINT(6) NOT NULL DEFAULT 1 COMMENT '商户状态: 0-停用, 1-正常',
         `remark` VARCHAR(128) COMMENT '商户备注',
         `init_user_id` BIGINT(20) DEFAULT NULL COMMENT '初始用户ID（创建商户时，允许商户登录的用户）',

jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/MchInfo.java

@@ -93,11 +93,6 @@ public class MchInfo extends BaseModel implements Serializable {
      */
     private String contactEmail;
 
-    /**
-     * 私钥
-     */
-    private String privateKey;
-
     /**
      * 商户状态: 0-停用, 1-正常
      */

jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java

@@ -138,7 +138,7 @@ public class CurrentUserController extends CommonCtrl{
 			throw new BizException("新密码与原密码不能相同！");
 		}
 
-		sysUserAuthService.resetAuthInfo(opSysUserId, null, null, opUserPwd, CS.SYS_TYPE.MGR);
+		sysUserAuthService.resetAuthInfo(opSysUserId, null, null, opUserPwd, CS.SYS_TYPE.MCH);
 		//调用登出接口
 		return logout();
 	}

jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/MchInfoMapper.xml

@@ -12,7 +12,6 @@
         <result column="contact_name" property="contactName" />
         <result column="contact_tel" property="contactTel" />
         <result column="contact_email" property="contactEmail" />
-        <result column="private_key" property="privateKey" />
         <result column="state" property="state" />
         <result column="remark" property="remark" />
         <result column="init_user_id" property="initUserId" />