Merge branch 'master' of http://git.hchbox.com/yuyou/client into master

src/main/java/com/yuyou/openapi/openapi/model/convert/XiaomaMessageConverter.java

@@ -74,7 +74,9 @@ public class XiaomaMessageConverter {
         try {
             xiaomaMessageDTO.getData().setMobile(Base64.encode(xiaomaMessageDTO.getData().getMobile()));
             String encryptedMobile = SecurityService.encrypt(xiaomaMessageDTO.getData().getMobile(), SecurityConstants.PHONE);
+            String encryptedName = SecurityService.encrypt(xiaomaMessageDTO.getData().getName(), SecurityConstants.SIMPLE);
             xiaomaMessageDO.setPnum(encryptedMobile);
+            xiaomaMessageDO.setStuName(encryptedName);
         } catch (Exception e) {
             log.error("Encrypt data raise Error, recId = {}, error is :", xiaomaMessageDTO.getTag().getTag_key_id(), e);
             xiaomaMessageDO.setPnum(xiaomaMessageDTO.getData().getMobile());

src/main/java/com/yuyou/openapi/openapi/model/dataobject/XiaomaMessageDO.java

@@ -40,6 +40,12 @@ public class XiaomaMessageDO {
     @Column(name = "rec_id")
     private Long recId;
 
+    /**
+     * 报课学生名
+     */
+    @Column(name = "stu_name")
+    private String stuName;
+
     /**
      * 报课学生码
      */

src/main/java/com/yuyou/openapi/openapi/model/dto/XiaomaMessageDTO.java

@@ -40,6 +40,11 @@ public class XiaomaMessageDTO {
          */
         private Long tag_key_id;
 
+        /**
+         * 报课学生名
+         */
+        private String tag_key_name;
+
         /**
          * 联系方式
          */
@@ -67,6 +72,11 @@ public class XiaomaMessageDTO {
     @NoArgsConstructor
     public static class Datas {
 
+        /**
+         * 报课学生名
+         */
+        private String name;
+
         /**
          * 手机号
          */