Browse Source

微信移动端支付

guomengjiao 4 months ago
parent
commit
5108506228

+ 10 - 10
.idea/workspace.xml

@@ -30,7 +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/service/ResearchBriefReportLabelRelevancyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportLabelRelevancyService.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -467,14 +467,7 @@
       <workItem from="1736127959643" duration="53060000" />
       <workItem from="1736385778472" duration="73782000" />
       <workItem from="1737337698393" duration="12755000" />
-      <workItem from="1737443783514" duration="2208000" />
-    </task>
-    <task id="LOCAL-00048" summary="个人中心">
-      <created>1735200866094</created>
-      <option name="number" value="00048" />
-      <option name="presentableId" value="LOCAL-00048" />
-      <option name="project" value="LOCAL" />
-      <updated>1735200866094</updated>
+      <workItem from="1737443783514" duration="16279000" />
     </task>
     <task id="LOCAL-00049" summary="支付宝移动端支付">
       <created>1735206001200</created>
@@ -812,7 +805,14 @@
       <option name="project" value="LOCAL" />
       <updated>1737445321358</updated>
     </task>
-    <option name="localTasksCounter" value="97" />
+    <task id="LOCAL-00097" summary="微信移动端支付">
+      <created>1737446319550</created>
+      <option name="number" value="00097" />
+      <option name="presentableId" value="LOCAL-00097" />
+      <option name="project" value="LOCAL" />
+      <updated>1737446319550</updated>
+    </task>
+    <option name="localTasksCounter" value="98" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

+ 0 - 2
modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java

@@ -276,8 +276,6 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 
 	public List<ResearchBriefReportLabel> categoryPage(String marketType) {
 		ResearchBriefReportLabel label = new ResearchBriefReportLabel();
-		label.setPageNo(1);
-		label.setPageSize(20);
 		label.setNotParentId("0");
 		label.setExistReport(1);
 		label.setMarketType(marketType);