|
|
@ -1,9 +1,51 @@ |
|
|
<?xml version="1.0" encoding="UTF-8"?> |
|
|
<?xml version="1.0" encoding="UTF-8"?> |
|
|
<project version="4"> |
|
|
<project version="4"> |
|
|
<component name="ChangeListManager"> |
|
|
<component name="ChangeListManager"> |
|
|
<list default="true" id="8b88b979-c3fa-4858-8fa6-d3a5d334cf69" name="Default Changelist" comment="优惠券列表接口调整"> |
|
|
|
|
|
|
|
|
<list default="true" id="8b88b979-c3fa-4858-8fa6-d3a5d334cf69" name="Default Changelist" comment="1、"> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml" afterDir="false" /> |
|
|
<change afterPath="$PROJECT_DIR$/admin-hanhai-vue/dist.zip" afterDir="false" /> |
|
|
<change afterPath="$PROJECT_DIR$/admin-hanhai-vue/dist.zip" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/controller/MassageRefoundLogController.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/entity/MassageRefoundLog.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/mapper/MassageRefoundLogMapper.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/mapper/xml/MassageRefoundLogMapper.xml" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/service/IMassageRefoundLogService.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/service/impl/MassageRefoundLogServiceImpl.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue/MassageRefoundLogList.vue" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue/modules/MassageRefoundLogForm.vue" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue/modules/MassageRefoundLogModal.Style#Drawer.vue" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue/modules/MassageRefoundLogModal.vue" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue3/MassageRefoundLog.api.ts" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue3/MassageRefoundLog.data.ts" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue3/MassageRefoundLogList.vue" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageRefoundLog/vue3/components/MassageRefoundLogModal.vue" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/RefoundController.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/WxMiniappPayService.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/WxMiniappPayServiceImpl.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/CreateOrderReq.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/HttpServletUtils.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/PayOrderInfo.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/QueryOrderReq.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/RefundOrderReq.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/Response.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/WxPayAutoCertificateConfig.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wxUtils/WxPayConfig.java" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/apiclient_key.pem" afterDir="false" /> |
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/pub_key.pem" afterDir="false" /> |
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/admin-hanhai-vue/.env.development" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/.env.development" afterDir="false" /> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/admin-hanhai-vue/.env.production" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/.env.production" afterDir="false" /> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/controller/MassageOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/controller/MassageOrderController.java" afterDir="false" /> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/entity/MassageOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/entity/MassageOrder.java" afterDir="false" /> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/mapper/MassageOrderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/mapper/MassageOrderMapper.java" afterDir="false" /> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/service/IMassageOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/service/IMassageOrderService.java" afterDir="false" /> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/service/impl/MassageOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/service/impl/MassageOrderServiceImpl.java" afterDir="false" /> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue/MassageOrderList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue/MassageOrderList.vue" afterDir="false" /> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue/modules/MassageOrderForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue/modules/MassageOrderForm.vue" afterDir="false" /> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue3/MassageOrder.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageOrder/vue3/MassageOrder.data.ts" afterDir="false" /> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/jeecg-boot-module-system.iml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/jeecg-boot-module-system.iml" afterDir="false" /> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/pom.xml" afterDir="false" /> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java" afterDir="false" /> |
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/application-dev.yml" afterDir="false" /> |
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/application-dev.yml" afterDir="false" /> |
|
|
</list> |
|
|
</list> |
|
|
<option name="SHOW_DIALOG" value="false" /> |
|
|
<option name="SHOW_DIALOG" value="false" /> |
|
|
@ -56,7 +98,7 @@ |
|
|
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> |
|
|
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> |
|
|
<property name="WebServerToolWindowFactoryState" value="false" /> |
|
|
<property name="WebServerToolWindowFactoryState" value="false" /> |
|
|
<property name="aspect.path.notification.shown" value="true" /> |
|
|
<property name="aspect.path.notification.shown" value="true" /> |
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/../.." /> |
|
|
|
|
|
|
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources" /> |
|
|
<property name="nodejs_package_manager_path" value="yarn" /> |
|
|
<property name="nodejs_package_manager_path" value="yarn" /> |
|
|
<property name="project.structure.last.edited" value="Project" /> |
|
|
<property name="project.structure.last.edited" value="Project" /> |
|
|
<property name="project.structure.proportion" value="0.0" /> |
|
|
<property name="project.structure.proportion" value="0.0" /> |
|
|
@ -68,12 +110,19 @@ |
|
|
</component> |
|
|
</component> |
|
|
<component name="RecentsManager"> |
|
|
<component name="RecentsManager"> |
|
|
<key name="CopyClassDialog.RECENTS_KEY"> |
|
|
<key name="CopyClassDialog.RECENTS_KEY"> |
|
|
<recent name="org.jeecg.modules.apiBean" /> |
|
|
|
|
|
|
|
|
<recent name="org.jeecg.modules.apiService" /> |
|
|
<recent name="org.jeecg.modules.api.massageController" /> |
|
|
<recent name="org.jeecg.modules.api.massageController" /> |
|
|
|
|
|
<recent name="org.jeecg.modules.apiBean" /> |
|
|
<recent name="org.jeecg.modules.apiService.impl" /> |
|
|
<recent name="org.jeecg.modules.apiService.impl" /> |
|
|
</key> |
|
|
</key> |
|
|
|
|
|
<key name="CopyFile.RECENT_KEYS"> |
|
|
|
|
|
<recent name="D:\Projects\massage\massage-admin\jeecg-boot-module-system\src\main\resources" /> |
|
|
|
|
|
<recent name="D:\Projects\massage\massage-admin\jeecg-boot-module-system\src\main\resources\templates" /> |
|
|
|
|
|
<recent name="D:\Projects\massage\massage-admin\jeecg-boot-module-system\src\main\java\org\jeecg\modules" /> |
|
|
|
|
|
<recent name="D:\Projects\massage\massage-admin\han-hai-module-pay\src\main\resources" /> |
|
|
|
|
|
</key> |
|
|
</component> |
|
|
</component> |
|
|
<component name="RunManager" selected="Spring Boot.JeecgSystemApplication"> |
|
|
|
|
|
|
|
|
<component name="RunManager" selected="Application.CommonUtils"> |
|
|
<configuration name="CommonUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> |
|
|
<configuration name="CommonUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> |
|
|
<option name="ALTERNATIVE_JRE_PATH" value="1.8" /> |
|
|
<option name="ALTERNATIVE_JRE_PATH" value="1.8" /> |
|
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" /> |
|
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" /> |
|
|
@ -191,7 +240,10 @@ |
|
|
<workItem from="1741573016746" duration="4323000" /> |
|
|
<workItem from="1741573016746" duration="4323000" /> |
|
|
<workItem from="1741580646045" duration="5038000" /> |
|
|
<workItem from="1741580646045" duration="5038000" /> |
|
|
<workItem from="1741852577555" duration="74613000" /> |
|
|
<workItem from="1741852577555" duration="74613000" /> |
|
|
<workItem from="1744268260382" duration="6123000" /> |
|
|
|
|
|
|
|
|
<workItem from="1744268260382" duration="15845000" /> |
|
|
|
|
|
<workItem from="1746000753098" duration="13433000" /> |
|
|
|
|
|
<workItem from="1746752649258" duration="24956000" /> |
|
|
|
|
|
<workItem from="1747350180318" duration="76266000" /> |
|
|
</task> |
|
|
</task> |
|
|
<task id="LOCAL-00001" summary="1、项目初始化"> |
|
|
<task id="LOCAL-00001" summary="1、项目初始化"> |
|
|
<created>1741919155045</created> |
|
|
<created>1741919155045</created> |
|
|
@ -284,7 +336,70 @@ |
|
|
<option name="project" value="LOCAL" /> |
|
|
<option name="project" value="LOCAL" /> |
|
|
<updated>1743674700893</updated> |
|
|
<updated>1743674700893</updated> |
|
|
</task> |
|
|
</task> |
|
|
<option name="localTasksCounter" value="14" /> |
|
|
|
|
|
|
|
|
<task id="LOCAL-00014" summary="1、更换技术参数"> |
|
|
|
|
|
<created>1745658480340</created> |
|
|
|
|
|
<option name="number" value="00014" /> |
|
|
|
|
|
<option name="presentableId" value="LOCAL-00014" /> |
|
|
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
|
|
<updated>1745658480340</updated> |
|
|
|
|
|
</task> |
|
|
|
|
|
<task id="LOCAL-00015" summary="1、支付参数修改"> |
|
|
|
|
|
<created>1745924917363</created> |
|
|
|
|
|
<option name="number" value="00015" /> |
|
|
|
|
|
<option name="presentableId" value="LOCAL-00015" /> |
|
|
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
|
|
<updated>1745924917363</updated> |
|
|
|
|
|
</task> |
|
|
|
|
|
<task id="LOCAL-00016" summary="1、微信支付参数修改"> |
|
|
|
|
|
<created>1746374418272</created> |
|
|
|
|
|
<option name="number" value="00016" /> |
|
|
|
|
|
<option name="presentableId" value="LOCAL-00016" /> |
|
|
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
|
|
<updated>1746374418272</updated> |
|
|
|
|
|
</task> |
|
|
|
|
|
<task id="LOCAL-00017" summary="1、商家信息模块调整"> |
|
|
|
|
|
<created>1746374539012</created> |
|
|
|
|
|
<option name="number" value="00017" /> |
|
|
|
|
|
<option name="presentableId" value="LOCAL-00017" /> |
|
|
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
|
|
<updated>1746374539012</updated> |
|
|
|
|
|
</task> |
|
|
|
|
|
<task id="LOCAL-00018" summary="1、支付模块修复"> |
|
|
|
|
|
<created>1746964474717</created> |
|
|
|
|
|
<option name="number" value="00018" /> |
|
|
|
|
|
<option name="presentableId" value="LOCAL-00018" /> |
|
|
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
|
|
<updated>1746964474717</updated> |
|
|
|
|
|
</task> |
|
|
|
|
|
<task id="LOCAL-00019" summary="1、bug修复"> |
|
|
|
|
|
<created>1747481841675</created> |
|
|
|
|
|
<option name="number" value="00019" /> |
|
|
|
|
|
<option name="presentableId" value="LOCAL-00019" /> |
|
|
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
|
|
<updated>1747481841675</updated> |
|
|
|
|
|
</task> |
|
|
|
|
|
<task id="LOCAL-00020" summary="1、bug修复"> |
|
|
|
|
|
<created>1747564827951</created> |
|
|
|
|
|
<option name="number" value="00020" /> |
|
|
|
|
|
<option name="presentableId" value="LOCAL-00020" /> |
|
|
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
|
|
<updated>1747564827951</updated> |
|
|
|
|
|
</task> |
|
|
|
|
|
<task id="LOCAL-00021" summary="1、bug修复"> |
|
|
|
|
|
<created>1747624880660</created> |
|
|
|
|
|
<option name="number" value="00021" /> |
|
|
|
|
|
<option name="presentableId" value="LOCAL-00021" /> |
|
|
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
|
|
<updated>1747624880660</updated> |
|
|
|
|
|
</task> |
|
|
|
|
|
<task id="LOCAL-00022" summary="1、基础数据bug修复"> |
|
|
|
|
|
<created>1747651365497</created> |
|
|
|
|
|
<option name="number" value="00022" /> |
|
|
|
|
|
<option name="presentableId" value="LOCAL-00022" /> |
|
|
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
|
|
<updated>1747651365497</updated> |
|
|
|
|
|
</task> |
|
|
|
|
|
<option name="localTasksCounter" value="23" /> |
|
|
<servers /> |
|
|
<servers /> |
|
|
</component> |
|
|
</component> |
|
|
<component name="TypeScriptGeneratedFilesManager"> |
|
|
<component name="TypeScriptGeneratedFilesManager"> |
|
|
@ -318,17 +433,28 @@ |
|
|
<MESSAGE value="优惠券列表接口调整" /> |
|
|
<MESSAGE value="优惠券列表接口调整" /> |
|
|
<MESSAGE value="1、用户表新增字段:是否商家" /> |
|
|
<MESSAGE value="1、用户表新增字段:是否商家" /> |
|
|
<MESSAGE value="1、订单模块修改" /> |
|
|
<MESSAGE value="1、订单模块修改" /> |
|
|
<option name="LAST_COMMIT_MESSAGE" value="1、订单模块修改" /> |
|
|
|
|
|
|
|
|
<MESSAGE value="1、更换技术参数" /> |
|
|
|
|
|
<MESSAGE value="1、支付参数修改" /> |
|
|
|
|
|
<MESSAGE value="1、微信支付参数修改" /> |
|
|
|
|
|
<MESSAGE value="1、商家信息模块调整" /> |
|
|
|
|
|
<MESSAGE value="1、支付模块修复" /> |
|
|
|
|
|
<MESSAGE value="1、bug修复" /> |
|
|
|
|
|
<MESSAGE value="1、基础数据bug修复" /> |
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="1、基础数据bug修复" /> |
|
|
</component> |
|
|
</component> |
|
|
<component name="WindowStateProjectService"> |
|
|
<component name="WindowStateProjectService"> |
|
|
<state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1743581020633"> |
|
|
<state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1743581020633"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1743581020633" /> |
|
|
<state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1743581020633" /> |
|
|
<state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser" timestamp="1742378026634"> |
|
|
|
|
|
|
|
|
<state x="991" y="508" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1747709307430"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1742378026634" /> |
|
|
|
|
|
|
|
|
<state x="991" y="508" key="#com.intellij.fileTypes.FileTypeChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1747709307430" /> |
|
|
|
|
|
<state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser" timestamp="1747362074359"> |
|
|
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
|
|
</state> |
|
|
|
|
|
<state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1747362074359" /> |
|
|
<state x="1033" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1742351128151"> |
|
|
<state x="1033" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1742351128151"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
@ -337,74 +463,78 @@ |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state x="1010" y="449" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1741587414527" /> |
|
|
<state x="1010" y="449" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1741587414527" /> |
|
|
<state x="679" y="297" key="CommitChangelistDialog2" timestamp="1743674700028"> |
|
|
|
|
|
|
|
|
<state x="679" y="297" key="CommitChangelistDialog2" timestamp="1747796047643"> |
|
|
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
|
|
</state> |
|
|
|
|
|
<state x="679" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1747796047643" /> |
|
|
|
|
|
<state x="92" y="92" width="2376" height="1216" key="DiffContextDialog" timestamp="1747796045011"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state x="679" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1743674700028" /> |
|
|
|
|
|
<state x="92" y="92" width="2376" height="1216" key="DiffContextDialog" timestamp="1743674688479"> |
|
|
|
|
|
|
|
|
<state x="92" y="92" width="2376" height="1216" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1747796045011" /> |
|
|
|
|
|
<state x="1060" y="458" key="FileChooserDialogImpl" timestamp="1747551674976"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state x="92" y="92" width="2376" height="1216" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1743674688479" /> |
|
|
|
|
|
<state x="1060" y="458" key="FileChooserDialogImpl" timestamp="1743043710794"> |
|
|
|
|
|
|
|
|
<state x="1060" y="458" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1747551674976" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.bottom" timestamp="1747808992777"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state x="1060" y="458" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1743043710794" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.bottom" timestamp="1745658342152"> |
|
|
|
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1747808992777" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.center" timestamp="1747808992777"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state width="2517" height="388" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342152" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.center" timestamp="1745658342152"> |
|
|
|
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1747808992777" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.left" timestamp="1747808992777"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state width="2517" height="388" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342152" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.left" timestamp="1745658342152"> |
|
|
|
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1747808992777" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.right" timestamp="1747808992777"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state width="2517" height="388" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342152" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.right" timestamp="1745658342152"> |
|
|
|
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1747808992777" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.bottom" timestamp="1747808992698"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state width="2517" height="388" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342152" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.bottom" timestamp="1745658342071"> |
|
|
|
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1747808992698" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.center" timestamp="1747808992698"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state width="2517" height="388" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342071" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.center" timestamp="1745658342071"> |
|
|
|
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1747808992698" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.left" timestamp="1747808992698"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state width="2517" height="388" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342071" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.left" timestamp="1745658342071"> |
|
|
|
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1747808992698" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.right" timestamp="1747808992698"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state width="2517" height="388" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342071" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.right" timestamp="1745658342071"> |
|
|
|
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1747808992698" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.bottom" timestamp="1747808992698"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state width="2517" height="388" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1745658342071" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.bottom" timestamp="1743674795181"> |
|
|
|
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1747808992698" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.center" timestamp="1747808992698"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state width="2517" height="388" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1743674795181" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.center" timestamp="1743674795181"> |
|
|
|
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1747808992698" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.left" timestamp="1747808992698"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state width="2517" height="388" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1743674795181" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.left" timestamp="1743674795181"> |
|
|
|
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1747808992698" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.right" timestamp="1747808992698"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state width="2517" height="388" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1743674795181" /> |
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.right" timestamp="1743674795181"> |
|
|
|
|
|
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1747808992698" /> |
|
|
|
|
|
<state x="903" y="413" key="RollbackChangesDialog" timestamp="1747651622845"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state width="2517" height="388" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1743674795181" /> |
|
|
|
|
|
|
|
|
<state x="903" y="413" key="RollbackChangesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1747651622845" /> |
|
|
<state x="783" y="345" key="SettingsEditor" timestamp="1741573035388"> |
|
|
<state x="783" y="345" key="SettingsEditor" timestamp="1741573035388"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state x="783" y="345" key="SettingsEditor/0.0.2560.1400@0.0.2560.1400" timestamp="1741573035388" /> |
|
|
<state x="783" y="345" key="SettingsEditor/0.0.2560.1400@0.0.2560.1400" timestamp="1741573035388" /> |
|
|
<state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1743674705512"> |
|
|
|
|
|
|
|
|
<state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1747651367913"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1743674705512" /> |
|
|
|
|
|
|
|
|
<state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1747651367913" /> |
|
|
<state x="972" y="527" key="com.intellij.ide.util.TipDialog" timestamp="1741580728988"> |
|
|
<state x="972" y="527" key="com.intellij.ide.util.TipDialog" timestamp="1741580728988"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
@ -413,20 +543,30 @@ |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state x="900" y="426" width="759" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1742204627580" /> |
|
|
<state x="900" y="426" width="759" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1742204627580" /> |
|
|
<state x="943" y="315" width="672" height="678" key="search.everywhere.popup" timestamp="1742211424843"> |
|
|
|
|
|
|
|
|
<state x="943" y="315" width="672" height="678" key="search.everywhere.popup" timestamp="1747351903626"> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
</state> |
|
|
</state> |
|
|
<state x="943" y="315" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1742211424843" /> |
|
|
|
|
|
|
|
|
<state x="943" y="315" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1747351903626" /> |
|
|
</component> |
|
|
</component> |
|
|
<component name="XDebuggerManager"> |
|
|
<component name="XDebuggerManager"> |
|
|
<breakpoint-manager> |
|
|
<breakpoint-manager> |
|
|
<breakpoints> |
|
|
<breakpoints> |
|
|
<line-breakpoint enabled="true" type="java-line"> |
|
|
<line-breakpoint enabled="true" type="java-line"> |
|
|
<url>file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java</url> |
|
|
<url>file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java</url> |
|
|
<line>265</line> |
|
|
|
|
|
<option name="timeStamp" value="9" /> |
|
|
|
|
|
|
|
|
<line>471</line> |
|
|
|
|
|
<option name="timeStamp" value="31" /> |
|
|
|
|
|
</line-breakpoint> |
|
|
|
|
|
<line-breakpoint enabled="true" type="java-line"> |
|
|
|
|
|
<url>file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/WxMiniappPayServiceImpl.java</url> |
|
|
|
|
|
<line>249</line> |
|
|
|
|
|
<option name="timeStamp" value="36" /> |
|
|
</line-breakpoint> |
|
|
</line-breakpoint> |
|
|
</breakpoints> |
|
|
</breakpoints> |
|
|
</breakpoint-manager> |
|
|
</breakpoint-manager> |
|
|
|
|
|
<watches-manager> |
|
|
|
|
|
<configuration name="SpringBootApplicationConfigurationType"> |
|
|
|
|
|
<watch expression="productId" /> |
|
|
|
|
|
</configuration> |
|
|
|
|
|
</watches-manager> |
|
|
</component> |
|
|
</component> |
|
|
</project> |
|
|
</project> |