Ver código fonte

fix 联锁详细信息逻辑关系

LLL 8 meses atrás
pai
commit
324f46a75b

+ 5 - 5
jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/controller/InterlockDetailController.java

@@ -58,8 +58,8 @@ public class InterlockDetailController extends JeecgController<InterlockDetail,
 	 @SuppressWarnings("all")
 	 private InterlockDetailMapper interlockDetailMapper;
 
-	/**联锁总表-分页列表查询(各种逻辑状态)*/
-	 @ApiOperation(value="联锁总表-分页列表查询(各种逻辑状态)", notes="联锁总表-分页列表查询(各种逻辑状态)")
+	/**联锁逻辑状态-分页表查询*/
+	 @ApiOperation(value="联锁逻辑状态-分页表查询", notes="联锁逻辑状态-分页表查询")
 	 @GetMapping(value = "/list1")
 	 public Result<IPage<InterlockSummaryVO>> list1(InterlockSummaryVO vo,
 															@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -98,10 +98,10 @@ public class InterlockDetailController extends JeecgController<InterlockDetail,
 
 
 	 /**
-	  * 联锁详细信息表分页列表查询
+	  * 联锁详细信息——分页查询
 	  */
-	 //@AutoLog(value = "联锁详细信息表-分页列表查询")
-	 @ApiOperation(value="联锁详细信息表分页列表查询", notes="联锁详细信息表分页列表查询")
+	 //@AutoLog(value = "联锁详细信息——分页查询")
+	 @ApiOperation(value="联锁详细信息——分页查询", notes="联锁详细信息——分页查询")
 	 @GetMapping(value = "/list2")
 	 public Result<IPage<InterlockDetailQueryVO>> list2(InterlockDetailQueryDTO dto,
 												 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,

+ 1 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/vo/InterlockDetailQueryVO.java

@@ -79,6 +79,7 @@ public class InterlockDetailQueryVO {
     /**逻辑关系*/
     @Excel(name = "逻辑关系", width = 15)
     @ApiModelProperty(value = "逻辑关系")
+    @Dict(dicCode = "ljgx")
     private java.lang.String ljgx;
     /**联锁输出值*/
     @Excel(name = "联锁输出值", width = 15)