xuhy
2025-02-20 baad6b6254b2de028c04c46338286060a9f42b65
Merge remote-tracking branch 'origin/master'
2个文件已修改
22 ■■■■■ 已修改文件
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
@@ -348,7 +348,6 @@
    @ApiOperation(value = "管理员-我的审批-审批")
    @GetMapping("/examine")
    public R examine(@RequestParam String id){
        return R.ok();
    }
ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
@@ -82,26 +82,7 @@
    </select>
    <select id="pageListApplet" resultType="com.ruoyi.system.vo.TCheckAcceptRecordVO">
        select
        t.id,
        t.contract_id,
        t.house_id,
        t.check_time,
        t.lease_reason,
        t.check_person,
        t.accompany_person,
        t.overall_situation,
        t.furniture_situation,
        t.device_situation,
        t.clean_situation,
        t.other_problem,
        t.pictures,
        t.check_result,
        t.check_money,
        t.create_time,
        t.update_time,
        t.create_by,
        t.update_by,
        t.disabled,
        t1.*,
        c.contract_number,
        h.house_name
        from t_check_accept_record t