|
@@ -30,10 +30,6 @@
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="fc9366aa-6566-4981-8149-d75e02f8e884" name="默认的" comment="微信移动端支付">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/ResearchBriefReportControllerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/ResearchBriefReportControllerApi.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReportLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReportLabel.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportLabelDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportLabelDao.xml" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -461,14 +457,7 @@
|
|
|
<workItem from="1735970618647" duration="252000" />
|
|
|
<workItem from="1735970895886" duration="8433000" />
|
|
|
<workItem from="1736126123480" duration="510000" />
|
|
|
- <workItem from="1736127959643" duration="21605000" />
|
|
|
- </task>
|
|
|
- <task id="LOCAL-00029" summary="新增市场概括">
|
|
|
- <created>1734748258157</created>
|
|
|
- <option name="number" value="00029" />
|
|
|
- <option name="presentableId" value="LOCAL-00029" />
|
|
|
- <option name="project" value="LOCAL" />
|
|
|
- <updated>1734748258157</updated>
|
|
|
+ <workItem from="1736127959643" duration="24677000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00030" summary="简报分类">
|
|
|
<created>1734754137763</created>
|
|
@@ -806,7 +795,14 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1736155064589</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="78" />
|
|
|
+ <task id="LOCAL-00078" summary="微信移动端支付">
|
|
|
+ <created>1736214523167</created>
|
|
|
+ <option name="number" value="00078" />
|
|
|
+ <option name="presentableId" value="LOCAL-00078" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1736214523167</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="79" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|