he2802 2 年之前
父節點
當前提交
d21a66f56f

+ 1 - 1
zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -402,7 +402,7 @@ public class CommonController extends BaseController {
         return AjaxResult.success("成功", dualAuth);
     }
 
-    @ApiOperation("decodeTel")
+    @ApiOperation("decodeTel加密")
     @GetMapping("common/free/decodeTel")
     public AjaxResult<String> decodeTel(String key) {
         return AjaxResult.success("成功", EncryptHandler.decrypt(key));

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/sdk/service/impl/TopNuoMplatformLogServiceImpl.java

@@ -122,7 +122,7 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
                 TopNuoMplatformLog update = new TopNuoMplatformLog();
                 update.setId(id);
                 update.setResult(result);
-                ;           JSONObject jsonObject = (JSONObject) JSONObject.parse(result);
+                JSONObject jsonObject = (JSONObject) JSONObject.parse(result);
                 String code = String.valueOf(jsonObject.get("code"));
                 String describe = String.valueOf(jsonObject.get("describe"));
                 update.setResultCode(code);

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/domain/TopCourseEducationType.java

@@ -44,4 +44,5 @@ private static final long serialVersionUID=1L;
     private Integer sort;
     @TableField(exist = false)
     private Long oId;
+    private String schemeName;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopCourseEducationTypeVo.java

@@ -44,4 +44,6 @@ public class TopCourseEducationTypeVo {
 	private Integer sort;
 	@ApiModelProperty("")
 	private String tireStatus;
+	@ApiModelProperty("方案名称")
+	private String schemeName;
 }

+ 2 - 1
zhongzheng-system/src/main/resources/mapper/modules/course/CourseBusinessMapper.xml

@@ -56,7 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             e.education_name,
             e.id as education_id,
             p.project_name,
-            t.name as template_name
+            t.name as template_name,
+            cpt.id as project_id
         FROM
             course_business b
                 LEFT JOIN course_project_type p on b.project_id =p.id