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

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/digitalmans/domain/dto/DmVisitorsDto.java

@@ -22,4 +22,6 @@ public class DmVisitorsDto extends DmVisitorsPo {
     public static final Long TYPE_VIP_VISITOR = 9L;
     public static final Long TYPE_SPECIAL_VISITOR = 10L;
 
+    public String imgUrl;
+
 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmStaffInnerApiController.java

@@ -90,6 +90,7 @@ public class DmStaffInnerApiController extends BaseApiController {
                 if (r.getData() instanceof  DmResourcesDto) {
                     DmResourcesDto dmResourcesDto = (DmResourcesDto) r.getData();
                     v.setResourceId(dmResourcesDto.getId());
+                    v.setAvatar(dmResourcesDto.getUrl());
                 } else {
                     return output(ResponseCode.FILE_UPLOAD_FAIL, r.getMsg()).toJSON();
                 }
@@ -108,6 +109,7 @@ public class DmStaffInnerApiController extends BaseApiController {
                 if (r.getData() instanceof  DmResourcesDto) {
                     DmResourcesDto dmResourcesDto = (DmResourcesDto) r.getData();
                     staffPo.setResourceId(dmResourcesDto.getId());
+                    staffPo.setAvatar(dmResourcesDto.getUrl());
                 } else {
                     return output(ResponseCode.FILE_UPLOAD_FAIL, r.getMsg()).toJSON();
                 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorInnerApiController.java

@@ -194,7 +194,7 @@ public class DmVisitorInnerApiController extends BaseApiController {
                 }
 
                 iDmResourcesService.addOne(dmResourcesDto);
-
+                v.setAvatar(dmResourcesDto.getUrl());
                 v.setResourceId(dmResourcesDto.getId());
             }
             dmVisitorsMapper.addOne(v);

xueyi-modules/xueyi-system/src/main/resources/mapper/staff/DmVisitorsMapper.xml

@@ -9,14 +9,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
             select LAST_INSERT_ID()
         </selectKey>
-        insert into dm_visitors(name,nickname,phone,visitor_company,type,resource_id) values
+        insert into dm_visitors(name,nickname,phone,visitor_company,type,resource_id,avatar) values
         (
             #{name},
             #{nickname},
             #{phone},
             #{visitorCompany},
             #{type},
-            #{resourceId}
+            #{resourceId},
+            #{avatar}
         )
     </insert >
 </mapper>