Merge branch 'release-知象光电' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/controller/SceneFileController.java

src/main/java/com/fdkankan/contro/controller/SceneFileController.java

@@ -4,11 +4,13 @@ import cn.hutool.core.codec.Base64;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneSource;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.contro.annotation.SignVerification;
 import com.fdkankan.contro.entity.ScenePlus;
+import com.fdkankan.contro.entity.SceneZxgd;
 import com.fdkankan.contro.service.*;
 import com.fdkankan.contro.vo.ReportFailLogVO;
 import com.fdkankan.contro.vo.ResponseSceneFile;
@@ -209,4 +211,15 @@ public class SceneFileController{
         return ResultData.ok();
     }
 
+    @Autowired
+    private ISceneZxgdService sceneZxgdService;
+
+    @GetMapping("/getZxgd/{search}")
+    public ResultData getZxgd(@PathVariable(value = "search") String search) throws Exception{
+        LambdaQueryWrapper<SceneZxgd> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(SceneZxgd::getTitle, search).or().like(SceneZxgd::getUnicode, search);
+        List<SceneZxgd> list = sceneZxgdService.list(wrapper);
+        return ResultData.ok(list);
+    }
+
 }