|
@@ -30,6 +30,7 @@
|
|
|
<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/report/src/main/java/com/jeesite/modules/report/entity/WebsiteUserOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/WebsiteUserOrder.java" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -457,14 +458,7 @@
|
|
|
<workItem from="1735970618647" duration="252000" />
|
|
|
<workItem from="1735970895886" duration="8433000" />
|
|
|
<workItem from="1736126123480" duration="510000" />
|
|
|
- <workItem from="1736127959643" duration="42187000" />
|
|
|
- </task>
|
|
|
- <task id="LOCAL-00036" summary="简报查询">
|
|
|
- <created>1734947692048</created>
|
|
|
- <option name="number" value="00036" />
|
|
|
- <option name="presentableId" value="LOCAL-00036" />
|
|
|
- <option name="project" value="LOCAL" />
|
|
|
- <updated>1734947692048</updated>
|
|
|
+ <workItem from="1736127959643" duration="46192000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00037" summary="简报">
|
|
|
<created>1734948019915</created>
|
|
@@ -802,7 +796,14 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1736315372103</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="85" />
|
|
|
+ <task id="LOCAL-00085" summary="微信移动端支付">
|
|
|
+ <created>1736316423146</created>
|
|
|
+ <option name="number" value="00085" />
|
|
|
+ <option name="presentableId" value="LOCAL-00085" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1736316423146</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="86" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -828,6 +829,31 @@
|
|
|
</State>
|
|
|
</value>
|
|
|
</entry>
|
|
|
+ <entry key="a75c77db-1d94-46fa-b90c-c31128f6dc27">
|
|
|
+ <value>
|
|
|
+ <State>
|
|
|
+ <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
|
|
|
+ <option name="FILTERS">
|
|
|
+ <map>
|
|
|
+ <entry key="branch">
|
|
|
+ <value>
|
|
|
+ <list>
|
|
|
+ <option value="HEAD" />
|
|
|
+ </list>
|
|
|
+ </value>
|
|
|
+ </entry>
|
|
|
+ <entry key="roots">
|
|
|
+ <value>
|
|
|
+ <list>
|
|
|
+ <option value="$PROJECT_DIR$" />
|
|
|
+ </list>
|
|
|
+ </value>
|
|
|
+ </entry>
|
|
|
+ </map>
|
|
|
+ </option>
|
|
|
+ </State>
|
|
|
+ </value>
|
|
|
+ </entry>
|
|
|
<entry key="ed946976-efc8-4c95-8fe2-52a6bfe143c3">
|
|
|
<value>
|
|
|
<State>
|
|
@@ -888,9 +914,14 @@
|
|
|
<breakpoint-manager>
|
|
|
<breakpoints>
|
|
|
<line-breakpoint enabled="true" type="java-line">
|
|
|
- <url>file://$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java</url>
|
|
|
- <line>108</line>
|
|
|
- <option name="timeStamp" value="12" />
|
|
|
+ <url>jar://$PROJECT_DIR$/../../../repository/com/jeesite/jeesite-framework/5.2.0-SNAPSHOT/jeesite-framework-5.2.0-SNAPSHOT.jar!/com/jeesite/modules/file/utils/FileUploadUtils.class</url>
|
|
|
+ <line>47</line>
|
|
|
+ <option name="timeStamp" value="17" />
|
|
|
+ </line-breakpoint>
|
|
|
+ <line-breakpoint enabled="true" type="java-line">
|
|
|
+ <url>file://$PROJECT_DIR$/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java</url>
|
|
|
+ <line>53</line>
|
|
|
+ <option name="timeStamp" value="18" />
|
|
|
</line-breakpoint>
|
|
|
</breakpoints>
|
|
|
</breakpoint-manager>
|