Merge remote-tracking branch 'origin/master'

liujie

2023-09-27 4146ce356365a67fec0509d64ebcf52f74c7ade9

Merge remote-tracking branch 'origin/master'

 .idea/workspace.xml

@@ -22,7 +22,10 @@
    <select />
  </component>
  <component name="ChangeListManager">
    <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。10" />
    <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。11">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -284,7 +287,7 @@
      <workItem from="1695633789585" duration="4703000" />
      <workItem from="1695638521906" duration="1415000" />
      <workItem from="1695689815334" duration="13353000" />
      <workItem from="1695718856285" duration="21192000" />
      <workItem from="1695718856285" duration="22098000" />
    </task>
    <task id="LOCAL-00001" summary="后台代码删除">
      <created>1690249807612</created>
@@ -521,7 +524,15 @@
      <option name="project" value="LOCAL" />
      <updated>1695739914189</updated>
    </task>
    <option name="localTasksCounter" value="32" />
    <task id="LOCAL-00032" summary="9.26。11">
      <option name="closed" value="true" />
      <created>1695740202022</created>
      <option name="number" value="00032" />
      <option name="presentableId" value="LOCAL-00032" />
      <option name="project" value="LOCAL" />
      <updated>1695740202022</updated>
    </task>
    <option name="localTasksCounter" value="33" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -557,7 +568,8 @@
    <MESSAGE value="9.26。8" />
    <MESSAGE value="9.26。9" />
    <MESSAGE value="9.26。10" />
    <option name="LAST_COMMIT_MESSAGE" value="9.26。10" />
    <MESSAGE value="9.26。11" />
    <option name="LAST_COMMIT_MESSAGE" value="9.26。11" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>

 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java

@@ -210,6 +210,7 @@
    @ResponseBody
    @PostMapping("/coursePackage/addCoursePackage")
    public Integer addCoursePackage(@RequestBody TCoursePackage coursePackage){
        coursePackage.setNeedNum(coursePackage.getCodeTime());
        return coursePackageService.addCoursePackage(coursePackage);
    }