Merge remote-tracking branch 'origin/master'

common/src/main/java/com/winsun/bean/AuthCode.java

+package com.winsun.bean;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@TableName("hhr_authcode")
+public class AuthCode implements Serializable {
+
+    private static final long serialVersionUID =  6941854875917339515L;
+
+    @TableId(value = "id")
+    private String id;
+
+    @TableField(value = "user_authcode")
+    private Integer userAuthCode;
+
+}

common/src/main/java/com/winsun/bean/School.java

@@ -169,6 +169,12 @@ public class School implements Serializable {
 	private String kdyBtn;
 	private String kdyBtn;
 
 
 	/**
 	/**
+	 * 是否显示优惠购机按钮
+	 */
+	@TableField("is_showyhgj")
+	private String yhgj;
+
+	/**
 	 * 宽带、融合是否甩单
 	 * 宽带、融合是否甩单
 	 */
 	 */
 	@TableField("jilt_kd")
 	@TableField("jilt_kd")

common/src/main/java/com/winsun/mapper/AuthCodeMapper.java

+package com.winsun.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.AuthCode;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+@Mapper
+@Component
+public interface AuthCodeMapper extends BaseMapper<AuthCode> {
+
+
+    @Select("select id,user_authcode as userAuthCode from hhr_authcode where id = #{id} ")
+    List<AuthCode> queryAuthCode(String id);
+}

new-user/src/main/java/com/winsun/controller/PackageNewClothes.java

@@ -143,7 +143,7 @@ public class PackageNewClothes {
      * 新开手机卡  预制卡
      * 新开手机卡  预制卡
      *
      *
      * @param site          省市县
      * @param site          省市县
-     * @param address        详细地址
+     * @param address       详细地址
      * @param kapin         套餐名
      * @param kapin         套餐名
      * @param idCardz       身份证正面地址
      * @param idCardz       身份证正面地址
      * @param idCardf       身份证反面地址
      * @param idCardf       身份证反面地址

service-manager/src/main/java/com/winsun/controller/AuthCodeController.java

+package com.winsun.controller;
+
+import com.winsun.auth.core.annotion.Permission;
+import com.winsun.auth.core.base.controller.BaseController;
+import com.winsun.auth.core.common.model.ResponseData;
+import com.winsun.bean.AuthCode;
+import com.winsun.mapper.AuthCodeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.Pattern;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: chenhaojian
+ * @Date: 2021/1/14
+ */
+@RestController
+@RequestMapping("/authCode")
+public class AuthCodeController extends BaseController {
+
+    private static AuthCodeMapper authCodeMapper;
+
+    // 查询验证码
+    @Permission(menuname = "查询验证码",value = "queryAuthCode",method = RequestMethod.POST)
+    public ResponseData<List<AuthCode>> queryAuthCodeList(@RequestParam(name = "id",required = false) String id){
+
+        List<AuthCode> queryAuthCodeList = authCodeMapper.queryAuthCode(id);
+        return ResponseData.success(queryAuthCodeList,"查询完毕！");
+    }
+    @Autowired
+    public AuthCodeController(AuthCodeMapper authCodeMapper){
+        AuthCodeController.authCodeMapper = authCodeMapper;
+    }
+}