Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

jiangqs

2023-08-06 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskRecordMapper.xml

@@ -20,6 +20,7 @@
        tmtr.task_id taskId,
        tmt.task_date taskDate,
        tmtr.follow_type followType,
        tmtr.custome_follow_type customeFollowType,
        tmtr.call_time callTime,
        tmtr.follow_content followContent,
        tmtr.call_phone callPhone
@@ -36,6 +37,7 @@
        tmtr.task_id taskId,
        tmt.create_time createTime,
        tmtr.follow_type followType,
        tmtr.custome_follow_type customeFollowType,
        tmtr.call_time callTime,
        tmtr.follow_content followContent,
        tmtr.call_phone callPhone
@@ -54,6 +56,7 @@
            tmtr.task_id taskId,
            tmt.create_time createTime,
            tmtr.follow_type followType,
            tmtr.custome_follow_type customeFollowType,
            tmtr.call_time callTime,
            tmtr.follow_content followContent,
            tmtr.call_phone callPhone