Merge branch 'master' into master-手术随访

陈昶聿

昨天 cc3fe1ad9b366533d184d9e239b45f731f014e74

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/EquipmentinfoController.java

@@ -7,8 +7,6 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.ReportReqVo;
import com.ruoyi.system.service.IBaseUserInfoService;
import com.smartor.domain.DingTalkReqVo;
import com.smartor.service.DingTalkService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;