Parcourir la source

客户标签复杂查询

zangguocen il y a 3 ans
Parent
commit
fb7ad4bbc7

+ 9 - 6
.idea/compiler.xml

@@ -7,16 +7,17 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="yijia-admin" />
-        <module name="yijia-station" />
-        <module name="yijia-market" />
+        <module name="yijia-label" />
         <module name="yijia-customer" />
         <module name="yijia-integral" />
-        <module name="yijia-framework" />
-        <module name="yijia-quartz" />
+        <module name="yijia-market" />
+        <module name="yijia-station" />
         <module name="yijia-generator" />
-        <module name="yijia-coupon" />
-        <module name="yijia-common" />
+        <module name="yijia-quartz" />
         <module name="yijia-system" />
+        <module name="yijia-framework" />
+        <module name="yijia-common" />
+        <module name="yijia-coupon" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
@@ -28,6 +29,8 @@
       <module name="yijia-framework" target="1.8" />
       <module name="yijia-generator" target="1.8" />
       <module name="yijia-integral" target="1.8" />
+      <module name="yijia-label" target="1.8" />
+      <module name="yijia-lable" target="1.8" />
       <module name="yijia-market" target="1.8" />
       <module name="yijia-quartz" target="1.8" />
       <module name="yijia-station" target="1.8" />

+ 2 - 0
.idea/encodings.xml

@@ -21,6 +21,8 @@
     <file url="file://$PROJECT_DIR$/yijia-integral" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-integral/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-integral/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yijia-label/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yijia-label/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-market" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-market/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-market/src/main/resources" charset="UTF-8" />

+ 1 - 0
.idea/modules.xml

@@ -10,6 +10,7 @@
       <module fileurl="file://$PROJECT_DIR$/yijia-framework/yijia-framework.iml" filepath="$PROJECT_DIR$/yijia-framework/yijia-framework.iml" />
       <module fileurl="file://$PROJECT_DIR$/yijia-generator/yijia-generator.iml" filepath="$PROJECT_DIR$/yijia-generator/yijia-generator.iml" />
       <module fileurl="file://$PROJECT_DIR$/yijia-integral/yijia-integral.iml" filepath="$PROJECT_DIR$/yijia-integral/yijia-integral.iml" />
+      <module fileurl="file://$PROJECT_DIR$/yijia-label/yijia-label.iml" filepath="$PROJECT_DIR$/yijia-label/yijia-label.iml" />
       <module fileurl="file://$PROJECT_DIR$/yijia-market/yijia-market.iml" filepath="$PROJECT_DIR$/yijia-market/yijia-market.iml" />
       <module fileurl="file://$PROJECT_DIR$/yijia-quartz/yijia-quartz.iml" filepath="$PROJECT_DIR$/yijia-quartz/yijia-quartz.iml" />
       <module fileurl="file://$PROJECT_DIR$/yijia-station/yijia-station.iml" filepath="$PROJECT_DIR$/yijia-station/yijia-station.iml" />

+ 124 - 0
.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

+ 1061 - 14
.idea/workspace.xml

@@ -4,17 +4,312 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d95263d0-9dff-44b4-8deb-343711f78d5d" name="Default Changelist" comment="前端配置文件package-config.json删除">
+    <list default="true" id="d95263d0-9dff-44b4-8deb-343711f78d5d" name="Default Changelist" comment="删除没有用的引入包">
+      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-admin/src/main/java/com/yijia/web/test.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-admin/target/classes/com/yijia/web/controller/system/SysAgentController.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-admin/target/maven-archiver/pom.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-admin/target/yijia-admin.jar.original" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-common/target/maven-archiver/pom.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-common/target/yijia-common-1.0.1.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-customer/target/maven-archiver/pom.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-customer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-customer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-customer/target/yijia-customer-1.0.1.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-framework/target/maven-archiver/pom.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-framework/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-framework/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-framework/target/yijia-framework-1.0.1.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-generator/target/maven-archiver/pom.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-generator/target/yijia-generator-1.0.1.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-integral/target/maven-archiver/pom.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-integral/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-integral/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-integral/target/yijia-integral-1.0.1.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/controller/CustomerLabelController.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/controller/LabelRuleController.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/controller/LabelRuleDetailController.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/domain/CustomerLabel.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/domain/LabelRule.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/domain/LabelRuleDetail.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/domain/RequsetSysDept.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/domain/RequstCustomerLabel.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/domain/ResponeCustomerLabel.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/mapper/CustomerLabelMapper.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/mapper/LabelRuleDetailMapper.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/mapper/LabelRuleMapper.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/service/ICustomerLabelService.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/service/ILabelRuleDetailService.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/service/ILabelRuleService.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/service/impl/CustomerLabelServiceImpl.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/service/impl/LabelRuleDetailServiceImpl.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/com/yijia/label/service/impl/LabelRuleServiceImpl.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/mapper/label/CustomerLabelMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/mapper/label/LabelRuleDetailMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/classes/mapper/label/LabelRuleMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/maven-archiver/pom.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-label/target/yijia-label-1.0.1.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/markert/controller/MarkertPlanController.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/markert/controller/MarketCouponController.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/markert/domain/MarkertPlan.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/markert/mapper/MarkertPlanMapper.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/markert/mapper/MarketCouponMapper.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/markert/service/IMarkertPlanService.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/markert/service/IMarketCouponService.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/markert/service/impl/MarkertPlanServiceImpl.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/markert/service/impl/MarketCouponServiceImpl.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-market/target/maven-archiver/pom.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-market/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-market/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-market/target/yijia-market-1.0.1.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-quartz/target/maven-archiver/pom.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-quartz/target/yijia-quartz-1.0.1.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationBalanceChangeController.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationPay111Controller.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationSettlementPriceAdjustController.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationSettlementPriceController.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/DeptInfoDemo.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationBalanceChange.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationSettlementPrice.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationSettlementPriceAdjust.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/SysDeptDemo.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/StationBalanceChangeMapper.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/StationSettlementPriceAdjustMapper.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/StationSettlementPriceMapper.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IStationBalanceChangeService.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IStationSettlementPriceAdjustService.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IStationSettlementPriceService.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/StationBalanceChangeServiceImpl.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/StationSettlementPriceAdjustServiceImpl.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/StationSettlementPriceServiceImpl.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationBalanceChangeMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationSettlementPriceAdjustMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationSettlementPriceMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/domain/SysAgent.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/mapper/SysAgentMapper.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/service/ISysAgentService.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/service/impl/SysAgentServiceImpl.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/SysAgentMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-system/target/maven-archiver/pom.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/yijia-system/target/yijia-system-1.0.1.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_2_1.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_2_1.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_74.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_74.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_10.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_10.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_10_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_10_6.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_10.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_10.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_10.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_oshi_oshi_core_5_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_oshi_oshi_core_5_2_5.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_2_0.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_3_0.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_3_0.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_5.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__eu_bitwalker_UserAgentUtils_1_19.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__eu_bitwalker_UserAgentUtils_1_19.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_1.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_8_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_buffer_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_buffer_4_1_52_Final.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_4_1_52_Final.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_common_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_common_4_1_52_Final.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_4_1_52_Final.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_4_1_52_Final.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_4_1_52_Final.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_20_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_20_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_21.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_21.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_21.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_21.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_21.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_21.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_16.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_16.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_java_dev_jna_jna_5_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_java_dev_jna_jna_5_5_0.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_java_dev_jna_jna_platform_5_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_java_dev_jna_jna_platform_5_5_0.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_11.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_6.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_38.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_38.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_38.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_38.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_38.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_38.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_20_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_20_Final.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_3_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_3_Final.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_3.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_3.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_2.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_17_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_17_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_17_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_17_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_17_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_17_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_17_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_17_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_17_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_17_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_17_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_17_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_17_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_17_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_17_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_17_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_17_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_17_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_1_17_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_1_17_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_17_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_17_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_17_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_17_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_20_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_20_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_20_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_20_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_20_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_20_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_1_12_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_1_12_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_1_12_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_1_12_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_1_12_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_1_12_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_1_18_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_1_18_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_1_18_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_1_18_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_1_18_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_1_18_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_18_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_18_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_1_18_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_1_18_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_1_18_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_1_18_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_18_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_18_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_18_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_18_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_18_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_18_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_1_18_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_1_18_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_1_18_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_1_18_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_18_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_18_RELEASE.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/src/main/resources/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/src/main/resources/application-druid.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-admin/src/main/resources/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/src/main/resources/logback.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/application-druid.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/com/yijia/web/controller/common/CommonController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/com/yijia/web/controller/common/CommonController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/com/yijia/web/controller/system/SysDeptController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/com/yijia/web/controller/system/SysDeptController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/com/yijia/web/controller/system/SysDictDataController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/com/yijia/web/controller/system/SysDictDataController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/com/yijia/web/controller/system/SysUserController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/com/yijia/web/controller/system/SysUserController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-admin/target/classes/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/target/classes/logback.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-admin/yijia-admin.iml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-admin/yijia-admin.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/config/YiJiaConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/config/YiJiaConfig.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/AjaxResult.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/AjaxResult.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/BaseEntity.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/BaseEntity.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/entity/SysDept.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/entity/SysDept.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yijia-customer/src/main/java/com/yijia/customer/domain/CustomerGradeSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/src/main/java/com/yijia/customer/domain/CustomerGradeSetting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/entity/SysUser.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/core/domain/entity/SysUser.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/utils/file/FileUploadUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/utils/file/FileUploadUtils.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/utils/file/FileUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/utils/file/FileUtils.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/utils/http/HttpHelper.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/utils/http/HttpHelper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/utils/http/HttpUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/utils/http/HttpUtils.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/utils/poi/ExcelUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-common/target/classes/com/yijia/common/utils/poi/ExcelUtil.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-coupon/src/main/resources/mapper/coupon/CouponInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/src/main/resources/mapper/coupon/CouponInfoMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-coupon/target/classes/mapper/coupon/CouponInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/classes/mapper/coupon/CouponInfoMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-coupon/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/maven-archiver/pom.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-coupon/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-coupon/target/yijia-coupon-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-coupon/target/yijia-coupon-1.0.1.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/src/main/resources/mapper/customer/CustomerCardUseRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/src/main/resources/mapper/customer/CustomerCardUseRecordMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/src/main/resources/mapper/customer/CustomerManageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/src/main/resources/mapper/customer/CustomerManageMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/controller/CustomerCardRecordConsumptionController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/controller/CustomerCardRecordConsumptionController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/controller/CustomerCardSettingController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/controller/CustomerCardSettingController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/controller/CustomerCardUseRecordController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/controller/CustomerCardUseRecordController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/controller/CustomerElectronicCardController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/controller/CustomerElectronicCardController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/controller/CustomerManageController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/controller/CustomerManageController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/domain/CustomerCardRecordConsumption.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/domain/CustomerCardRecordConsumption.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/domain/CustomerCardSetting.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/domain/CustomerCardSetting.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/domain/CustomerCardUseRecord.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/domain/CustomerCardUseRecord.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/domain/CustomerElectronicCard.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/domain/CustomerElectronicCard.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/domain/CustomerGradeSetting.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/domain/CustomerGradeSetting.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/domain/CustomerManage.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/domain/CustomerManage.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/mapper/CustomerCardUseRecordMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/mapper/CustomerCardUseRecordMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/mapper/CustomerManageMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/mapper/CustomerManageMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/service/ICustomerCardUseRecordService.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/service/ICustomerCardUseRecordService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/service/ICustomerManageService.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/service/ICustomerManageService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/service/impl/CustomerCardSettingServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/service/impl/CustomerCardSettingServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/service/impl/CustomerCardUseRecordServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/service/impl/CustomerCardUseRecordServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/service/impl/CustomerManageServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/com/yijia/customer/service/impl/CustomerManageServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CustomerCardSettingDetailMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CustomerCardSettingDetailMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CustomerCardSettingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CustomerCardSettingMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CustomerCardUseRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CustomerCardUseRecordMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CustomerElectronicCardMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CustomerElectronicCardMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CustomerGradeSettingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CustomerGradeSettingMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CustomerManageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-customer/target/classes/mapper/customer/CustomerManageMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-framework/target/classes/com/yijia/framework/aspectj/DataSourceAspect.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-framework/target/classes/com/yijia/framework/aspectj/DataSourceAspect.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-framework/target/classes/com/yijia/framework/config/CaptchaConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-framework/target/classes/com/yijia/framework/config/CaptchaConfig.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-generator/src/main/resources/generator.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-generator/src/main/resources/generator.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-generator/target/classes/generator.yml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-generator/target/classes/generator.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/controller/CustomerPointsController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/controller/CustomerPointsController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/controller/IntegralOrderController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/controller/IntegralOrderController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/controller/IntegralRuleController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/controller/IntegralRuleController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/domain/CustomerPointsRecord.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/domain/CustomerPointsRecord.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/domain/IntegralOrder.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/domain/IntegralOrder.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/domain/IntegralRule.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/domain/IntegralRule.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/domain/IntegralWares.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/domain/IntegralWares.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/service/impl/IntegralRuleServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/com/yijia/integral/service/impl/IntegralRuleServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/mapper/integral/CustomerPointsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/mapper/integral/CustomerPointsMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/mapper/integral/CustomerPointsRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/mapper/integral/CustomerPointsRecordMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/mapper/integral/IntegralOrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/mapper/integral/IntegralOrderMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/mapper/integral/IntegralRuleMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/mapper/integral/IntegralRuleMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-integral/target/classes/mapper/integral/IntegralWaresMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-integral/target/classes/mapper/integral/IntegralWaresMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-label/src/main/resources/mapper/label/CustomerLabelDemoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-label/src/main/resources/mapper/label/CustomerLabelDemoMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-label/yijia-label.iml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-label/yijia-label.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/market/controller/MarkertPlanController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/market/controller/MarketCouponController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/market/domain/MarkertPlan.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/market/domain/MarketCoupon.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/markert/domain/MarketCoupon.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/market/mapper/MarkertPlanMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/market/mapper/MarketCouponMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/market/service/IMarkertPlanService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/market/service/IMarketCouponService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/market/service/impl/MarkertPlanServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-market/target/classes/com/yijia/market/service/impl/MarketCouponServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-market/target/classes/mapper/market/MarkertPlanMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-market/target/classes/mapper/market/MarkertPlanMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-market/target/classes/mapper/market/MarketCouponMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-market/target/classes/mapper/market/MarketCouponMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/NoOilOrderController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/NoOilOrderController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/PayOrderController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/PayOrderController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationClassStructureController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationClassStructureController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationClassesSummaryController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationClassesSummaryController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationDeviceManageController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationDeviceManageController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationInfoController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationInfoController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationOilGunController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationOilGunController.class" afterDir="false" />
@@ -22,13 +317,22 @@
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationOilPriceController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationOilPriceController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationPayController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationPayController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationPersonnelController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationPersonnelController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationPicController.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/controller/StationPicController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/PayOrder.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/PayOrder.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationClassStructure.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationClassStructure.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationDeviceManage.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationDeviceManage.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationOilPrice.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationOilPrice.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationPay.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationPay.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationPersonnel.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationPersonnel.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationPic.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/domain/StationPic.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/PayOrderMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/PayOrderMapper.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/StationOilPriceMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/mapper/StationOilPriceMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IPayOrderService.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IPayOrderService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IStationOilPriceService.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/IStationOilPriceService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/PayOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/PayOrderServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/StationOilPriceServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/StationOilPriceServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/StationPayServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/service/impl/StationPayServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/utils/FeiEPrinterUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/com/yijia/station/utils/FeiEPrinterUtil.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/PayOrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/PayOrderMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationClassStructureMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationClassStructureMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationDeviceManageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationDeviceManageMapper.xml" afterDir="false" />
@@ -37,18 +341,51 @@
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationOilPriceMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationOilPriceMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationPayMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationPayMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationPersonnelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/classes/mapper/station/StationPersonnelMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-archiver/pom.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/target/yijia-station-1.0.1.jar" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/target/yijia-station-1.0.1.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-station/yijia-station.iml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-station/yijia-station.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/domain/SysDeptDemo.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/mapper/SysDeptMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/mapper/SysDeptMapper.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/mapper/SysDictDataMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/mapper/SysDictDataMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/mapper/SysUserMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/mapper/SysUserMapper.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/service/ISysDeptService.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/service/ISysDeptService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/service/ISysUserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/service/ISysUserService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/service/impl/SysDeptServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/service/impl/SysDeptServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/service/impl/SysUserServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/classes/com/yijia/system/service/impl/SysUserServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/SysDeptMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/SysDeptMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/SysDictDataMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/SysDictDataMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/SysUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/yijia-system/target/classes/mapper/system/SysUserMapper.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="DatabaseView">
+    <option name="SHOW_INTERMEDIATE" value="true" />
+    <option name="GROUP_DATA_SOURCES" value="true" />
+    <option name="GROUP_SCHEMA" value="true" />
+    <option name="GROUP_CONTENTS" value="false" />
+    <option name="SORT_POSITIONED" value="false" />
+    <option name="SHOW_EMPTY_GROUPS" value="false" />
+    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
+    <option name="HIDDEN_KINDS">
+      <set />
+    </option>
+    <expand />
+    <select />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="FxmlFile" />
+        <option value="spring-beans.schema" />
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -68,14 +405,49 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <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$/yijia-label/src/main/resources/mapper/label" />
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.detected.package.tslint" value="true" />
+    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.path.for.package.tslint" value="project" />
+    <property name="node.js.selected.package.eslint" value="(autodetect)" />
+    <property name="node.js.selected.package.tslint" value="(autodetect)" />
     <property name="nodejs_package_manager_path" value="npm" />
+    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="reactor" />
   </component>
-  <component name="ReactorSettings">
-    <option name="notificationShown" value="true" />
+  <component name="RecentsManager">
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="com.yijia.station.service" />
+      <recent name="com.yijia.station.controller" />
+    </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.yijia.label.mapper" />
+      <recent name="com.yijia.label.service.impl" />
+      <recent name="com.yijia.label.domain" />
+    </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\开发项目\SAAS-AFTEREND\yijia-label\src\main\resources\mapper\label" />
+      <recent name="D:\开发项目" />
+      <recent name="D:\开发项目\SAAS-AFTEREND" />
+    </key>
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Spring Boot.YiJiaApplication">
+    <configuration name="test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.yijia.web.test" />
+      <module name="yijia-admin" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.yijia.web.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="YiJiaApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="yijia-admin" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.yijia.YiJiaApplication" />
@@ -83,8 +455,29 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Application.test" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="ServiceViewManager">
+    <option name="viewStates">
+      <list>
+        <serviceView>
+          <treeState>
+            <expand />
+            <select />
+          </treeState>
+        </serviceView>
+      </list>
+    </option>
+    <option name="showServicesTree" value="false" />
+  </component>
+  <component name="SpellCheckerSettings" BundledDictionaries="0" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="application-level" UseSingleDictionary="true" />
+  <component name="SvnConfiguration">
+    <configuration />
   </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="d95263d0-9dff-44b4-8deb-343711f78d5d" name="Default Changelist" comment="" />
@@ -103,6 +496,65 @@
       <workItem from="1622557599863" duration="17000" />
       <workItem from="1622818227278" duration="26000" />
       <workItem from="1622818289564" duration="63000" />
+      <workItem from="1623581434936" duration="3149000" />
+      <workItem from="1623594933567" duration="46000" />
+      <workItem from="1623724045761" duration="17972000" />
+      <workItem from="1623804548031" duration="302000" />
+      <workItem from="1623804940504" duration="15388000" />
+      <workItem from="1623891445908" duration="16593000" />
+      <workItem from="1623977072261" duration="19479000" />
+      <workItem from="1624089275283" duration="951000" />
+      <workItem from="1624236468771" duration="13580000" />
+      <workItem from="1624278193851" duration="589000" />
+      <workItem from="1624279054577" duration="1549000" />
+      <workItem from="1624322970147" duration="12602000" />
+      <workItem from="1624409364719" duration="1816000" />
+      <workItem from="1624412333657" duration="1271000" />
+      <workItem from="1624426424948" duration="5165000" />
+      <workItem from="1624496054790" duration="333000" />
+      <workItem from="1624497325493" duration="9032000" />
+      <workItem from="1624582712571" duration="18295000" />
+      <workItem from="1624842327326" duration="7214000" />
+      <workItem from="1624887672760" duration="898000" />
+      <workItem from="1624888913289" duration="2415000" />
+      <workItem from="1624896871092" duration="797000" />
+      <workItem from="1624928644802" duration="17856000" />
+      <workItem from="1625100102517" duration="24768000" />
+      <workItem from="1625187136350" duration="18281000" />
+      <workItem from="1625229801576" duration="360000" />
+      <workItem from="1625533311248" duration="1164000" />
+      <workItem from="1625534770392" duration="5297000" />
+      <workItem from="1625540886637" duration="18152000" />
+      <workItem from="1625705821288" duration="24841000" />
+      <workItem from="1625792455977" duration="22441000" />
+      <workItem from="1626052076163" duration="6889000" />
+      <workItem from="1626137544995" duration="24853000" />
+      <workItem from="1626224484065" duration="28534000" />
+      <workItem from="1626270096425" duration="7937000" />
+      <workItem from="1626309771524" duration="16134000" />
+      <workItem from="1626397029036" duration="20294000" />
+      <workItem from="1626657173218" duration="22807000" />
+      <workItem from="1626742003271" duration="18938000" />
+      <workItem from="1626829108357" duration="9564000" />
+      <workItem from="1626915329482" duration="6308000" />
+      <workItem from="1627002572361" duration="9407000" />
+      <workItem from="1627261441315" duration="2846000" />
+      <workItem from="1627269567650" duration="3434000" />
+      <workItem from="1627292337936" duration="1420000" />
+      <workItem from="1627346739029" duration="2841000" />
+      <workItem from="1627355574657" duration="940000" />
+      <workItem from="1627438167426" duration="3160000" />
+      <workItem from="1627461511869" duration="2512000" />
+      <workItem from="1627520626319" duration="9126000" />
+      <workItem from="1627628887383" duration="622000" />
+      <workItem from="1627636880488" duration="595000" />
+      <workItem from="1627649392314" duration="342000" />
+      <workItem from="1627868243436" duration="5621000" />
+      <workItem from="1627893445782" duration="595000" />
+      <workItem from="1627952026659" duration="9224000" />
+      <workItem from="1628037877247" duration="13270000" />
+      <workItem from="1628092822724" duration="712000" />
+      <workItem from="1628124192861" duration="733000" />
     </task>
     <task id="LOCAL-00001" summary="前端配置文件package-config.json删除">
       <created>1619772586309</created>
@@ -118,30 +570,625 @@
       <option name="project" value="LOCAL" />
       <updated>1619773193656</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="增加标签管理">
+      <created>1623805126883</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1623805126883</updated>
+    </task>
+    <task id="LOCAL-00004" summary="标签管理">
+      <created>1624270608239</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1624270608239</updated>
+    </task>
+    <task id="LOCAL-00005" summary="修改标签规则">
+      <created>1624349102950</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1624349102950</updated>
+    </task>
+    <task id="LOCAL-00006" summary="修改之前以为你包名错误引发的问题">
+      <created>1624349383289</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1624349383289</updated>
+    </task>
+    <task id="LOCAL-00007" summary="x修改文件名问题">
+      <created>1624349853197</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1624349853197</updated>
+    </task>
+    <task id="LOCAL-00008" summary="修改标签">
+      <created>1624350041927</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1624350041927</updated>
+    </task>
+    <task id="LOCAL-00009" summary="增加字段">
+      <created>1624350405906</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1624350405906</updated>
+    </task>
+    <task id="LOCAL-00010" summary="优化默认的油站信息">
+      <created>1624350755316</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1624350755316</updated>
+    </task>
+    <task id="LOCAL-00011" summary="修改油站信息">
+      <created>1624350945987</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1624350945987</updated>
+    </task>
+    <task id="LOCAL-00012" summary="充值消费查询,按照日期查询">
+      <created>1624351040781</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1624351040781</updated>
+    </task>
+    <task id="LOCAL-00013" summary="修改标签">
+      <created>1624426462045</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1624426462045</updated>
+    </task>
+    <task id="LOCAL-00014" summary="修改充值消费">
+      <created>1624426667330</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1624426667330</updated>
+    </task>
+    <task id="LOCAL-00015" summary="修改标签修改">
+      <created>1624435073005</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1624435073005</updated>
+    </task>
+    <task id="LOCAL-00016" summary="增加标签管理">
+      <created>1624496217956</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1624496217956</updated>
+    </task>
+    <task id="LOCAL-00017" summary="电子卡增加标签营销方案">
+      <created>1624521587568</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1624521587568</updated>
+    </task>
+    <task id="LOCAL-00018" summary="增加营销管理字段">
+      <created>1624887996839</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1624887996839</updated>
+    </task>
+    <task id="LOCAL-00019" summary="便签管理">
+      <created>1624888161019</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1624888161019</updated>
+    </task>
+    <task id="LOCAL-00020" summary="标签接口引入">
+      <created>1624888233107</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1624888233107</updated>
+    </task>
+    <task id="LOCAL-00021" summary="客户信息">
+      <created>1624888295731</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1624888295731</updated>
+    </task>
+    <task id="LOCAL-00022" summary="客户标签绑定">
+      <created>1625106672117</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1625106672118</updated>
+    </task>
+    <task id="LOCAL-00023" summary="修改登陆人信息,代理人信息增加,部门信息查询">
+      <created>1625795043772</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1625795043772</updated>
+    </task>
+    <task id="LOCAL-00024" summary="代理人信息,用户信息">
+      <created>1625795086178</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1625795086178</updated>
+    </task>
+    <task id="LOCAL-00025" summary="增加代理人">
+      <created>1625795128687</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1625795128687</updated>
+    </task>
+    <task id="LOCAL-00026" summary="代理人管理">
+      <created>1625795160334</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1625795160334</updated>
+    </task>
+    <task id="LOCAL-00027" summary="增加代理人。代理集团。">
+      <created>1625795226432</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1625795226432</updated>
+    </task>
+    <task id="LOCAL-00028" summary="增加阶梯直降">
+      <created>1625795336302</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1625795336302</updated>
+    </task>
+    <task id="LOCAL-00029" summary="客户信息查询优化">
+      <created>1625795711164</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1625795711164</updated>
+    </task>
+    <task id="LOCAL-00030" summary="分级权限查询">
+      <created>1626138316438</created>
+      <option name="number" value="00030" />
+      <option name="presentableId" value="LOCAL-00030" />
+      <option name="project" value="LOCAL" />
+      <updated>1626138316438</updated>
+    </task>
+    <task id="LOCAL-00031" summary="分级权限查询">
+      <created>1626140290896</created>
+      <option name="number" value="00031" />
+      <option name="presentableId" value="LOCAL-00031" />
+      <option name="project" value="LOCAL" />
+      <updated>1626140290896</updated>
+    </task>
+    <task id="LOCAL-00032" summary="分级权限查询,lnG功能开发">
+      <created>1626284976664</created>
+      <option name="number" value="00032" />
+      <option name="presentableId" value="LOCAL-00032" />
+      <option name="project" value="LOCAL" />
+      <updated>1626284976664</updated>
+    </task>
+    <task id="LOCAL-00033" summary="修改设备类型1是小票机2是pos机">
+      <created>1626674675811</created>
+      <option name="number" value="00033" />
+      <option name="presentableId" value="LOCAL-00033" />
+      <option name="project" value="LOCAL" />
+      <updated>1626674675811</updated>
+    </task>
+    <task id="LOCAL-00034" summary="补打标签">
+      <created>1626759373661</created>
+      <option name="number" value="00034" />
+      <option name="presentableId" value="LOCAL-00034" />
+      <option name="project" value="LOCAL" />
+      <updated>1626759373661</updated>
+    </task>
+    <task id="LOCAL-00035" summary="删除没有用的引入包">
+      <created>1628038126804</created>
+      <option name="number" value="00035" />
+      <option name="presentableId" value="LOCAL-00035" />
+      <option name="project" value="LOCAL" />
+      <updated>1628038126804</updated>
+    </task>
+    <task id="LOCAL-00036" summary="增加司机优惠价格">
+      <created>1628038232514</created>
+      <option name="number" value="00036" />
+      <option name="presentableId" value="LOCAL-00036" />
+      <option name="project" value="LOCAL" />
+      <updated>1628038232514</updated>
+    </task>
+    <task id="LOCAL-00037" summary="增加员工逻辑删除">
+      <created>1628038287377</created>
+      <option name="number" value="00037" />
+      <option name="presentableId" value="LOCAL-00037" />
+      <option name="project" value="LOCAL" />
+      <updated>1628038287377</updated>
+    </task>
+    <task id="LOCAL-00038" summary="标签规则设置,增加是否强拉字段标签">
+      <created>1628038480195</created>
+      <option name="number" value="00038" />
+      <option name="presentableId" value="LOCAL-00038" />
+      <option name="project" value="LOCAL" />
+      <updated>1628038480195</updated>
+    </task>
+    <task id="LOCAL-00039" summary="增加城市字段,增加是都是lNG标识字段。">
+      <created>1628039022248</created>
+      <option name="number" value="00039" />
+      <option name="presentableId" value="LOCAL-00039" />
+      <option name="project" value="LOCAL" />
+      <updated>1628039022248</updated>
+    </task>
+    <task id="LOCAL-00040" summary="增加加油员id">
+      <created>1628066460415</created>
+      <option name="number" value="00040" />
+      <option name="presentableId" value="LOCAL-00040" />
+      <option name="project" value="LOCAL" />
+      <updated>1628066460415</updated>
+    </task>
+    <option name="localTasksCounter" value="41" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
+    <option name="version" value="1" />
+  </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
   </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>
         <entry key="MAIN">
           <value>
-            <State />
+            <State>
+              <option name="COLUMN_ORDER" />
+            </State>
           </value>
         </entry>
       </map>
     </option>
-    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="前端配置文件package-config.json删除" />
-    <option name="LAST_COMMIT_MESSAGE" value="前端配置文件package-config.json删除" />
+    <MESSAGE value="修改标签修改" />
+    <MESSAGE value="增加标签管理" />
+    <MESSAGE value="电子卡增加标签营销方案" />
+    <MESSAGE value="增加营销管理字段" />
+    <MESSAGE value="便签管理" />
+    <MESSAGE value="标签接口引入" />
+    <MESSAGE value="客户信息" />
+    <MESSAGE value="客户标签绑定" />
+    <MESSAGE value="修改登陆人信息,代理人信息增加,部门信息查询" />
+    <MESSAGE value="代理人信息,用户信息" />
+    <MESSAGE value="增加代理人" />
+    <MESSAGE value="代理人管理" />
+    <MESSAGE value="增加代理人。代理集团。" />
+    <MESSAGE value="增加阶梯直降" />
+    <MESSAGE value="客户信息查询优化" />
+    <MESSAGE value="分级权限查询" />
+    <MESSAGE value="分级权限查询,lnG功能开发" />
+    <MESSAGE value="修改设备类型1是小票机2是pos机" />
+    <MESSAGE value="补打标签" />
+    <MESSAGE value="删除没有用的引入包" />
+    <MESSAGE value="增加司机优惠价格" />
+    <MESSAGE value="增加员工逻辑删除" />
+    <MESSAGE value="标签规则设置,增加是否强拉字段标签" />
+    <MESSAGE value="增加城市字段,增加是都是lNG标识字段。" />
+    <MESSAGE value="增加加油员id" />
+    <option name="LAST_COMMIT_MESSAGE" value="增加加油员id" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="2511" y="202" key="#Project_Structure" timestamp="1626674692213">
+      <screen x="1998" y="0" width="1842" height="1080" />
+    </state>
+    <state x="2511" y="202" key="#Project_Structure/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626674692213" />
+    <state x="613" y="111" width="330" height="698" key="#com.intellij.ide.util.MemberChooser" timestamp="1628060217000">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state x="574" y="106" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624502676832" />
+    <state x="2638" y="134" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624588816155" />
+    <state x="2677" y="139" key="#com.intellij.ide.util.MemberChooser/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625208134199" />
+    <state x="613" y="111" key="#com.intellij.ide.util.MemberChooser/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625536749818" />
+    <state x="2687" y="139" width="330" height="698" key="#com.intellij.ide.util.MemberChooser/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627267573135" />
+    <state x="613" y="111" key="#com.intellij.ide.util.MemberChooser/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628060217000" />
+    <state x="613" y="111" key="#com.intellij.ide.util.MemberChooser/62.0.1474.864@62.0.1474.864" timestamp="1625230033870" />
+    <state x="2649" y="321" key="#com.intellij.ide.util.PackageChooserDialog" timestamp="1626141793813">
+      <screen x="1998" y="0" width="1842" height="1080" />
+    </state>
+    <state x="2649" y="321" key="#com.intellij.ide.util.PackageChooserDialog/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626141793813" />
+    <state x="2530" y="468" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1625808251467">
+      <screen x="1998" y="0" width="1842" height="1080" />
+    </state>
+    <state x="2530" y="468" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1625808251467" />
+    <state x="2602" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1625132595885">
+      <screen x="1982" y="0" width="1858" height="1080" />
+    </state>
+    <state x="2602" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625132595885" />
+    <state x="2649" y="290" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1626161037622">
+      <screen x="1998" y="0" width="1842" height="1080" />
+    </state>
+    <state x="2649" y="290" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626161037622" />
+    <state x="315" y="10" key="CommitChangelistDialog2" timestamp="1628066457913">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state x="264" y="10" key="CommitChangelistDialog2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624521586538" />
+    <state x="2250" y="13" key="CommitChangelistDialog2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624270606865" />
+    <state x="315" y="10" key="CommitChangelistDialog2/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625106671147" />
+    <state x="2314" y="13" key="CommitChangelistDialog2/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626759368770" />
+    <state x="315" y="10" key="CommitChangelistDialog2/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628066457913" />
+    <state x="315" y="10" key="CommitChangelistDialog2/62.0.1474.864@62.0.1474.864" timestamp="1628039017272" />
+    <state width="442" height="466" key="DebuggerActiveHint" timestamp="1625736545533">
+      <screen x="1998" y="0" width="1842" height="1080" />
+    </state>
+    <state width="442" height="466" key="DebuggerActiveHint/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1625736545533" />
+    <state x="203" y="73" width="1179" height="717" key="DiffContextDialog" timestamp="1628038977442">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state x="147" y="70" width="1228" height="685" key="DiffContextDialog/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624521628952" />
+    <state x="2174" y="91" width="1535" height="857" key="DiffContextDialog/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626140278320" />
+    <state x="203" y="73" width="1229" height="686" key="DiffContextDialog/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1627291889476" />
+    <state x="203" y="73" width="1179" height="717" key="DiffContextDialog/62.0.1474.864@62.0.1474.864" timestamp="1628038977442" />
+    <state x="2646" y="224" key="FileChooserDialogImpl" timestamp="1624952402323">
+      <screen x="1982" y="0" width="1858" height="1080" />
+    </state>
+    <state x="2606" y="216" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624268323786" />
+    <state x="549" y="171" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1623594937804" />
+    <state x="2646" y="224" key="FileChooserDialogImpl/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1624952402323" />
+    <state width="1431" height="231" key="GridCell.Tab.0.bottom" timestamp="1628092930649">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state width="1493" height="207" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624845068311" />
+    <state width="1877" height="278" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624270698088" />
+    <state width="1493" height="261" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1623594796805" />
+    <state width="1815" height="362" key="GridCell.Tab.0.bottom/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541178075" />
+    <state width="1431" height="470" key="GridCell.Tab.0.bottom/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625539990085" />
+    <state width="1799" height="305" key="GridCell.Tab.0.bottom/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627881554363" />
+    <state width="1431" height="231" key="GridCell.Tab.0.bottom/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448697" />
+    <state width="1431" height="231" key="GridCell.Tab.0.bottom/62.0.1474.864@62.0.1474.864" timestamp="1628092930649" />
+    <state width="1431" height="231" key="GridCell.Tab.0.center" timestamp="1628092930649">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state width="1493" height="207" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624845068311" />
+    <state width="1877" height="278" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624270698088" />
+    <state width="1493" height="261" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1623594796805" />
+    <state width="1815" height="362" key="GridCell.Tab.0.center/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541178075" />
+    <state width="1431" height="470" key="GridCell.Tab.0.center/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625539990085" />
+    <state width="1799" height="305" key="GridCell.Tab.0.center/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627881554363" />
+    <state width="1431" height="231" key="GridCell.Tab.0.center/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448697" />
+    <state width="1431" height="231" key="GridCell.Tab.0.center/62.0.1474.864@62.0.1474.864" timestamp="1628092930649" />
+    <state width="1431" height="231" key="GridCell.Tab.0.left" timestamp="1628092930648">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state width="1493" height="207" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624845068311" />
+    <state width="1877" height="278" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624270698088" />
+    <state width="1493" height="261" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1623594796805" />
+    <state width="1815" height="362" key="GridCell.Tab.0.left/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541178075" />
+    <state width="1431" height="470" key="GridCell.Tab.0.left/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625539990085" />
+    <state width="1799" height="305" key="GridCell.Tab.0.left/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627881554363" />
+    <state width="1431" height="231" key="GridCell.Tab.0.left/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448697" />
+    <state width="1431" height="231" key="GridCell.Tab.0.left/62.0.1474.864@62.0.1474.864" timestamp="1628092930648" />
+    <state width="1431" height="231" key="GridCell.Tab.0.right" timestamp="1628092930649">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state width="1493" height="207" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624845068311" />
+    <state width="1877" height="278" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624270698088" />
+    <state width="1493" height="261" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1623594796805" />
+    <state width="1815" height="362" key="GridCell.Tab.0.right/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541178075" />
+    <state width="1431" height="470" key="GridCell.Tab.0.right/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625539990085" />
+    <state width="1799" height="305" key="GridCell.Tab.0.right/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627881554363" />
+    <state width="1431" height="231" key="GridCell.Tab.0.right/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448697" />
+    <state width="1431" height="231" key="GridCell.Tab.0.right/62.0.1474.864@62.0.1474.864" timestamp="1628092930649" />
+    <state width="1431" height="490" key="GridCell.Tab.1.bottom" timestamp="1628071448689">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state width="1493" height="310" key="GridCell.Tab.1.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624845049196" />
+    <state width="1877" height="237" key="GridCell.Tab.1.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624270698081" />
+    <state width="1493" height="261" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1623594796806" />
+    <state width="1815" height="362" key="GridCell.Tab.1.bottom/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
+    <state width="1431" height="413" key="GridCell.Tab.1.bottom/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962646" />
+    <state width="1799" height="530" key="GridCell.Tab.1.bottom/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
+    <state width="1431" height="490" key="GridCell.Tab.1.bottom/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448689" />
+    <state width="1431" height="406" key="GridCell.Tab.1.bottom/62.0.1474.864@62.0.1474.864" timestamp="1627985853679" />
+    <state width="1431" height="490" key="GridCell.Tab.1.center" timestamp="1628071448689">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state width="1493" height="310" key="GridCell.Tab.1.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624845049196" />
+    <state width="1877" height="237" key="GridCell.Tab.1.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624270698081" />
+    <state width="1493" height="261" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1623594796806" />
+    <state width="1815" height="362" key="GridCell.Tab.1.center/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
+    <state width="1431" height="413" key="GridCell.Tab.1.center/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962646" />
+    <state width="1799" height="530" key="GridCell.Tab.1.center/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
+    <state width="1431" height="490" key="GridCell.Tab.1.center/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448689" />
+    <state width="1431" height="406" key="GridCell.Tab.1.center/62.0.1474.864@62.0.1474.864" timestamp="1627985853679" />
+    <state width="1431" height="490" key="GridCell.Tab.1.left" timestamp="1628071448689">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state width="1493" height="310" key="GridCell.Tab.1.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624845049196" />
+    <state width="1877" height="237" key="GridCell.Tab.1.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624270698081" />
+    <state width="1493" height="261" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1623594796806" />
+    <state width="1815" height="362" key="GridCell.Tab.1.left/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
+    <state width="1431" height="413" key="GridCell.Tab.1.left/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962646" />
+    <state width="1799" height="530" key="GridCell.Tab.1.left/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
+    <state width="1431" height="490" key="GridCell.Tab.1.left/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448689" />
+    <state width="1431" height="406" key="GridCell.Tab.1.left/62.0.1474.864@62.0.1474.864" timestamp="1627985853679" />
+    <state width="1431" height="490" key="GridCell.Tab.1.right" timestamp="1628071448689">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state width="1493" height="310" key="GridCell.Tab.1.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624845049196" />
+    <state width="1877" height="237" key="GridCell.Tab.1.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624270698081" />
+    <state width="1493" height="261" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1623594796806" />
+    <state width="1815" height="362" key="GridCell.Tab.1.right/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
+    <state width="1431" height="413" key="GridCell.Tab.1.right/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962646" />
+    <state width="1799" height="530" key="GridCell.Tab.1.right/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
+    <state width="1431" height="490" key="GridCell.Tab.1.right/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448689" />
+    <state width="1431" height="406" key="GridCell.Tab.1.right/62.0.1474.864@62.0.1474.864" timestamp="1627985853679" />
+    <state width="1431" height="490" key="GridCell.Tab.2.bottom" timestamp="1628071448690">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state width="1493" height="310" key="GridCell.Tab.2.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624845049196" />
+    <state width="1877" height="237" key="GridCell.Tab.2.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624270698082" />
+    <state width="1493" height="261" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1623594796806" />
+    <state width="1815" height="362" key="GridCell.Tab.2.bottom/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
+    <state width="1431" height="413" key="GridCell.Tab.2.bottom/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962647" />
+    <state width="1799" height="530" key="GridCell.Tab.2.bottom/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
+    <state width="1431" height="490" key="GridCell.Tab.2.bottom/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448690" />
+    <state width="1431" height="406" key="GridCell.Tab.2.bottom/62.0.1474.864@62.0.1474.864" timestamp="1627985853680" />
+    <state width="1431" height="490" key="GridCell.Tab.2.center" timestamp="1628071448690">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state width="1493" height="310" key="GridCell.Tab.2.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624845049196" />
+    <state width="1877" height="237" key="GridCell.Tab.2.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624270698081" />
+    <state width="1493" height="261" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1623594796806" />
+    <state width="1815" height="362" key="GridCell.Tab.2.center/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
+    <state width="1431" height="413" key="GridCell.Tab.2.center/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962646" />
+    <state width="1799" height="530" key="GridCell.Tab.2.center/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
+    <state width="1431" height="490" key="GridCell.Tab.2.center/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448690" />
+    <state width="1431" height="406" key="GridCell.Tab.2.center/62.0.1474.864@62.0.1474.864" timestamp="1627985853680" />
+    <state width="1431" height="490" key="GridCell.Tab.2.left" timestamp="1628071448689">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state width="1493" height="310" key="GridCell.Tab.2.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624845049196" />
+    <state width="1877" height="237" key="GridCell.Tab.2.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624270698081" />
+    <state width="1493" height="261" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1623594796806" />
+    <state width="1815" height="362" key="GridCell.Tab.2.left/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
+    <state width="1431" height="413" key="GridCell.Tab.2.left/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962646" />
+    <state width="1799" height="530" key="GridCell.Tab.2.left/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
+    <state width="1431" height="490" key="GridCell.Tab.2.left/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448689" />
+    <state width="1431" height="406" key="GridCell.Tab.2.left/62.0.1474.864@62.0.1474.864" timestamp="1627985853679" />
+    <state width="1431" height="490" key="GridCell.Tab.2.right" timestamp="1628071448690">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state width="1493" height="310" key="GridCell.Tab.2.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624845049196" />
+    <state width="1877" height="237" key="GridCell.Tab.2.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624270698081" />
+    <state width="1493" height="261" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1623594796806" />
+    <state width="1815" height="362" key="GridCell.Tab.2.right/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625541177903" />
+    <state width="1431" height="413" key="GridCell.Tab.2.right/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625118962646" />
+    <state width="1799" height="530" key="GridCell.Tab.2.right/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627874091344" />
+    <state width="1431" height="490" key="GridCell.Tab.2.right/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628071448690" />
+    <state width="1431" height="406" key="GridCell.Tab.2.right/62.0.1474.864@62.0.1474.864" timestamp="1627985853680" />
+    <state x="457" y="132" key="RollbackChangesDialog" timestamp="1627291822313">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state x="412" y="126" key="RollbackChangesDialog/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624351161500" />
+    <state x="457" y="132" key="RollbackChangesDialog/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1627291822313" />
+    <state x="400" y="21" key="SettingsEditor" timestamp="1627952237591">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state x="2360" y="98" key="SettingsEditor/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1623809712952" />
+    <state x="2420" y="26" key="SettingsEditor/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627463021455" />
+    <state x="400" y="21" key="SettingsEditor/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1627952237591" />
+    <state width="498" height="446" key="SwitcherDM" timestamp="1626317409209">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state width="498" height="446" key="SwitcherDM/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1626317409209" />
+    <state x="408" y="156" key="Vcs.Push.Dialog.v2" timestamp="1628066487588">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state x="361" y="149" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624521630401" />
+    <state x="2371" y="188" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624270612773" />
+    <state x="408" y="156" key="Vcs.Push.Dialog.v2/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625106675482" />
+    <state x="2430" y="195" key="Vcs.Push.Dialog.v2/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626759375489" />
+    <state x="408" y="156" key="Vcs.Push.Dialog.v2/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628066487588" />
+    <state x="408" y="156" key="Vcs.Push.Dialog.v2/62.0.1474.864@62.0.1474.864" timestamp="1628039025108" />
+    <state x="555" y="266" key="com.intellij.ide.util.TipDialog" timestamp="1628125102884">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state x="461" y="241" key="com.intellij.ide.util.TipDialog/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624842327062" />
+    <state x="2496" y="304" key="com.intellij.ide.util.TipDialog/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1623891446861" />
+    <state x="461" y="241" key="com.intellij.ide.util.TipDialog/0.0.1536.824@0.0.1536.824" timestamp="1624279054284" />
+    <state x="2603" y="333" key="com.intellij.ide.util.TipDialog/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625540886632" />
+    <state x="504" y="253" key="com.intellij.ide.util.TipDialog/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1624928836882" />
+    <state x="555" y="266" key="com.intellij.ide.util.TipDialog/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1628125102884" />
+    <state x="555" y="266" key="com.intellij.ide.util.TipDialog/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1627952027425" />
+    <state x="555" y="266" key="com.intellij.ide.util.TipDialog/62.0.1474.864@62.0.1474.864" timestamp="1628037877990" />
+    <state x="404" y="51" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1626834042581">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state x="404" y="51" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625111594055" />
+    <state x="404" y="51" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1626834042581" />
+    <state x="202" y="152" width="1132" height="565" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2" timestamp="1624412364624">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="202" y="152" width="1132" height="565" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624412364624" />
+    <state x="393" y="0" width="1081" height="742" key="dock-window-1" timestamp="1626676277215">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state x="393" y="0" width="1081" height="742" key="dock-window-1/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626676277215" />
+    <state x="2331" y="26" width="1029" height="850" key="dock-window-1/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1626402796996" />
+    <state x="2340" y="95" width="759" height="596" key="find.popup" timestamp="1627542367203">
+      <screen x="1998" y="0" width="1842" height="1080" />
+    </state>
+    <state x="627" y="-35" width="755" height="822" key="find.popup/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624610374755" />
+    <state x="2843" y="179" width="944" height="824" key="find.popup/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1624246970414" />
+    <state x="2589" y="273" width="759" height="596" key="find.popup/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625218868912" />
+    <state x="2340" y="95" width="759" height="596" key="find.popup/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627542367203" />
+    <state x="336" y="76" width="755" height="548" key="find.popup/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1627005888059" />
+    <state x="580" y="319" key="git4idea.ui.GitResetDialog" timestamp="1624349492955">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="580" y="319" key="git4idea.ui.GitResetDialog/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1624349492955" />
+    <state x="2560" y="266" width="700" height="530" key="recent.locations.popup" timestamp="1626680746891">
+      <screen x="1998" y="0" width="1842" height="1080" />
+    </state>
+    <state x="2560" y="266" width="700" height="530" key="recent.locations.popup/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1626680746891" />
+    <state x="524" y="200" key="run.anything.popup" timestamp="1626318275914">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state x="2575" y="250" key="run.anything.popup/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1625820790244" />
+    <state x="524" y="200" key="run.anything.popup/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1626318275914" />
+    <state x="476" y="152" width="673" height="712" key="search.everywhere.popup" timestamp="1628059938895">
+      <screen x="62" y="0" width="1474" height="864" />
+    </state>
+    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1623745463691" />
+    <state x="2459" y="183" width="840" height="856" key="search.everywhere.popup/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1623828008039" />
+    <state x="2504" y="190" width="813" height="889" key="search.everywhere.popup/62.0.1474.864/1982.0.1858.1080@1982.0.1858.1080" timestamp="1625219525449" />
+    <state x="476" y="152" width="672" height="712" key="search.everywhere.popup/62.0.1474.864/1982.0.1858.1080@62.0.1474.864" timestamp="1625537009967" />
+    <state x="2515" y="190" width="840" height="890" key="search.everywhere.popup/62.0.1474.864/1998.0.1842.1080@1998.0.1842.1080" timestamp="1627530876622" />
+    <state x="476" y="152" width="673" height="712" key="search.everywhere.popup/62.0.1474.864/1998.0.1842.1080@62.0.1474.864" timestamp="1628059938895" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-label/src/main/java/com/yijia/markert/controller/CustomerLabelController.java</url>
+          <line>116</line>
+          <option name="timeStamp" value="3" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/yijia-common/src/main/java/com/yijia/common/utils/SecurityUtils.java</url>
+          <line>75</line>
+          <option name="timeStamp" value="9" />
+        </line-breakpoint>
+        <line-breakpoint type="java-method">
+          <url>file://$PROJECT_DIR$/yijia-label/src/main/java/com/yijia/label/mapper/CustomerLabelMapper.java</url>
+          <line>27</line>
+          <properties class="com.yijia.label.mapper.CustomerLabelMapper" method="selectCustomerLabelList" />
+          <option name="timeStamp" value="5" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
     <select />
   </component>
+  <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/SAAS_AFTEREND$YiJiaApplication.ic" NAME="YiJiaApplication Coverage Results" MODIFIED="1625553163132" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+  </component>
 </project>

+ 40 - 42
yijia-label/src/main/resources/mapper/label/CustomerLabelDemoMapper.xml

@@ -35,62 +35,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="labelId != null "> and l.label_id >= #{labelId}</if>
             <if test="startCountNum != null "> and zq.count_num >= #{startCountNum}</if>
-            <if test="endCountNum != null "> and zq.count_num &lt;= #{endCountNum}</if>
-            <if test="amtFlag != null and amtFlag=='1' ">
+            <if test="endCountNum != null "> and zq.count_num &lt; #{endCountNum}</if>
+            <if test="amtFlag != null and amtFlag=='2'.toString()">
                 <choose>
                     <when test="startAmt != null and endAmt != null">
-                       and (  zq.amt >= #{startAmt} and zq.amt &lt;= #{endAmt})
+                       and (  zq.amt >= #{startAmt} and zq.amt &lt; #{endAmt})
                     </when>
                     <when test="startAmt != null and endAmt == null">
                         and  zq.amt >= #{startAmt}
                     </when>
                     <when test="endAmt != null and startAmt == null">
-                        and  zq.amt >= #{startAmt}
+                        and  zq.amt &lt; #{endAmt}
                     </when>
                     <otherwise>
                     </otherwise>
                 </choose>
             </if>
-            <if test="amtFlag != null and amtFlag=='2' ">
+            <if test="amtFlag != null and amtFlag=='1'.toString() ">
                 <choose>
                     <when test="startAmt != null and endAmt != null">
-                        or (  zq.amt >= #{startAmt} and zq.amt &lt;= #{endAmt})
+                        or (  zq.amt >= #{startAmt} and zq.amt &lt; #{endAmt})
                     </when>
                     <when test="startAmt != null and endAmt == null">
                         or  zq.amt >= #{startAmt}
                     </when>
                     <when test="endAmt != null and startAmt == null">
-                        or  zq.amt >= #{endAmt}
+                        or  zq.amt &lt; #{endAmt}
                     </when>
                     <otherwise>
                     </otherwise>
                 </choose>
             </if>
-            <if test="litersFlag != null and litersFlag=='1' ">
+            <if test="litersFlag != null and litersFlag=='2'.toString() ">
                 <choose>
                     <when test="startLiters != null and endLiters != null">
-                        and (  zq.order_liters >= #{startLiters} and zq.order_liters &lt;= #{endLiters})
+                        and (  zq.order_liters >= #{startLiters} and zq.order_liters &lt; #{endLiters})
                     </when>
                     <when test="startLiters != null and endLiters == null">
                         and  zq.order_liters >= #{startLiters}
                     </when>
                     <when test="endLiters != null and startLiters == null">
-                        and  zq.order_liters >= #{endLiters}
+                        and  zq.order_liters &lt; #{endLiters}
                     </when>
                     <otherwise>
                     </otherwise>
                 </choose>
             </if>
-            <if test="litersFlag != null and litersFlag=='2' ">
+            <if test="litersFlag != null and litersFlag=='1'.toString() ">
                 <choose>
                     <when test="startLiters != null and endLiters != null">
-                        or (  zq.order_liters >= #{startLiters} and zq.order_liters &lt;= #{endLiters})
+                        or (  zq.order_liters >= #{startLiters} and zq.order_liters &lt; #{endLiters})
                     </when>
                     <when test="startLiters != null and endLiters == null">
                         or  zq.order_liters >= #{startLiters}
                     </when>
                     <when test="endLiters != null and startLiters == null">
-                        or  zq.order_liters >= #{endLiters}
+                        or  zq.order_liters &lt; #{endLiters}
                     </when>
                     <otherwise>
                     </otherwise>
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="secondCustomerLabelDemoList" parameterType="CustomerLabelDemo" resultMap="CustomerLabelDemoResult">
         SELECT  zh.*,r.label_name,r.id as label_id from (
-        SELECT consumer_id,sum(order_liters) order_liters,count(1) count_num,p.station_id,max(created_date) as create_date,
+        SELECT consumer_id,sum(order_liters) order_liters,sum(amt) as amt,count(1) count_num,p.station_id,max(created_date) as create_date,
         a.mobile_phone as phone,blog_nick_name as customer_name
         from pay_order p
         join app_user_info a on a.user_id = p.consumer_id
@@ -138,17 +138,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where 1=1
         <if test="labelId != null "> and l.label_id = #{labelId}</if>
         <if test="stationId != null "> and zh.station_id = #{stationId}</if>
-        <if test="secondStartCountNum != null "> and zh.count_num >= #{secondStartCountNum}</if>
+        <if test="secondStartCountNum != null "> and zh.count_num > #{secondStartCountNum}</if>
         <if test="secondEndCountNum != null "> and  zh.count_num &lt;=#{secondEndCountNum} </if>
-        <if test="startCountNum != null "> and zq.count_num >= #{startCountNum}</if>
-        <if test="endCountNum != null "> and zq.count_num &lt;= #{endCountNum}</if>
-        <if test="secondAmtFlag != null and secondAmtFlag=='1' ">
+        <if test="secondAmtFlag != null and secondAmtFlag=='2'.toString() ">
             <choose>
                 <when test="secondStartAmt != null and secondEndAmt != null">
-                    and (  zh.amt >= #{secondStartAmt} and zh.amt &lt;= #{secondEndAmt})
+                    and (  zh.amt > #{secondStartAmt} and zh.amt &lt;= #{secondEndAmt})
                 </when>
                 <when test="secondStartAmt != null and secondEndAmt == null">
-                    and  zh.amt >= #{secondStartAmt}
+                    and  zh.amt > #{secondStartAmt}
                 </when>
                 <when test="secondEndAmt != null and secondStartAmt == null">
                     and  zh.amt &lt;= #{secondEndAmt}
@@ -157,13 +155,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </otherwise>
             </choose>
         </if>
-        <if test="secondAmtFlag != null and secondAmtFlag=='2' ">
+        <if test="secondAmtFlag != null and secondAmtFlag=='1'.toString() ">
             <choose>
                 <when test="secondStartAmt != null and secondEndAmt != null">
-                    or (  zh.amt >= #{secondStartAmt} and zh.amt &lt;=#{secondEndAmt})
+                    or (  zh.amt > #{secondStartAmt} and zh.amt &lt;=#{secondEndAmt})
                 </when>
                 <when test="secondStartAmt != null and secondEndAmt == null">
-                    or  zh.amt >= #{secondStartAmt}
+                    or  zh.amt > #{secondStartAmt}
                 </when>
                 <when test="secondEndAmt != null and startAmt == null">
                     or  zh.amt &lt;= #{secondEndAmt}
@@ -172,13 +170,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </otherwise>
             </choose>
         </if>
-        <if test="secondLitersFlag != null and secondLitersFlag=='1' ">
+        <if test="secondLitersFlag != null and secondLitersFlag=='2'.toString() ">
             <choose>
                 <when test="secondStartLiters != null and secondEndLiters != null">
-                    and (  zh.order_liters  >= #{secondStartLiters} and zh.order_liters  &lt;= #{secondEndLiters})
+                    and (  zh.order_liters  > #{secondStartLiters} and zh.order_liters  &lt;= #{secondEndLiters})
                 </when>
                 <when test="secondStartLiters != null and secondEndLiters == null">
-                    and  zh.order_liters  >= #{secondStartLiters}
+                    and  zh.order_liters  > #{secondStartLiters}
                 </when>
                 <when test="secondEndLiters != null and secondStartLiters == null">
                     and  zh.order_liters  &lt;= #{secondEndLiters}
@@ -187,13 +185,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </otherwise>
             </choose>
         </if>
-        <if test="secondLitersFlag != null and secondLitersFlag=='2' ">
+        <if test="secondLitersFlag != null and secondLitersFlag=='1'.toString() ">
             <choose>
                 <when test="secondStartLiters != null and secondEndLiters != null">
-                    or (  zh.order_liters  >= #{secondStartLiters} and zq.order_liters &lt;= #{secondEndLiters})
+                    or (  zh.order_liters  > #{secondStartLiters} and zq.order_liters &lt;= #{secondEndLiters})
                 </when>
                 <when test="secondStartLiters != null and secondEndLiters == null">
-                    or  zh.order_liters  >= #{secondStartLiters}
+                    or  zh.order_liters  > #{secondStartLiters}
                 </when>
                 <when test="secondEndLiters != null and secondStartLiters == null">
                     or  zh.order_liters &lt;= #{secondEndLiters}
@@ -225,62 +223,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="labelId != null "> and l.label_id = #{labelId}</if>
             <if test="stationId != null "> and zq.station_id = #{stationId}</if>
             <if test="startCountNum != null "> and zq.count_num >= #{startCountNum}</if>
-            <if test="endCountNum != null "> and zq.count_num &lt;= #{endCountNum}</if>
-            <if test="amtFlag != null and amtFlag=='1' ">
+            <if test="endCountNum != null "> and zq.count_num &lt; #{endCountNum}</if>
+            <if test="amtFlag != null and amtFlag=='2'.toString() ">
                 <choose>
                     <when test="startAmt != null and endAmt != null">
-                        and (  zq.amt >= #{startAmt} and zq.amt &lt;= #{endAmt})
+                        and (  zq.amt >= #{startAmt} and zq.amt &lt; #{endAmt})
                     </when>
                     <when test="startAmt != null and endAmt == null">
                         and  zq.amt >= #{startAmt}
                     </when>
                     <when test="endAmt != null and startAmt == null">
-                        and  zq.amt &lt;= #{startAmt}
+                        and  zq.amt &lt; #{endAmt}
                     </when>
                     <otherwise>
                     </otherwise>
                 </choose>
             </if>
-            <if test="amtFlag != null and amtFlag=='2' ">
+            <if test="amtFlag != null and amtFlag=='1'.toString() ">
                 <choose>
                     <when test="startAmt != null and endAmt != null">
-                        or (  zq.amt >= #{startAmt} and zq.amt &lt;= #{endAmt})
+                        or (  zq.amt >= #{startAmt} and zq.amt &lt; #{endAmt})
                     </when>
                     <when test="startAmt != null and endAmt == null">
                         or  zq.amt >= #{startAmt}
                     </when>
                     <when test="endAmt != null and startAmt == null">
-                        or  zq.amt &lt;= #{endAmt}
+                        or  zq.amt &lt; #{endAmt}
                     </when>
                     <otherwise>
                     </otherwise>
                 </choose>
             </if>
-            <if test="litersFlag != null and litersFlag=='1' ">
+            <if test="litersFlag != null and litersFlag=='2'.toString() ">
                 <choose>
                     <when test="startLiters != null and endLiters != null">
-                        and (  zq.order_liters >= #{startLiters} and zq.order_liters &lt;= #{endLiters})
+                        and (  zq.order_liters >= #{startLiters} and zq.order_liters &lt; #{endLiters})
                     </when>
                     <when test="startLiters != null and endLiters == null">
                         and  zq.order_liters >= #{startLiters}
                     </when>
                     <when test="endLiters != null and startLiters == null">
-                        and  zq.order_liters &lt;= #{endLiters}
+                        and  zq.order_liters &lt; #{endLiters}
                     </when>
                     <otherwise>
                     </otherwise>
                 </choose>
             </if>
-            <if test="litersFlag != null and litersFlag=='2' ">
+            <if test="litersFlag != null and litersFlag=='1'.toString() ">
                 <choose>
                     <when test="startLiters != null and endLiters != null">
-                        or (  zq.order_liters >= #{startLiters} and zq.order_liters &lt;= #{endLiters})
+                        or (  zq.order_liters >= #{startLiters} and zq.order_liters &lt; #{endLiters})
                     </when>
                     <when test="startLiters != null and endLiters == null">
                         or  zq.order_liters >= #{startLiters}
                     </when>
                     <when test="endLiters != null and startLiters == null">
-                        or  zq.order_liters &lt;=#{endLiters}
+                        or  zq.order_liters &lt; #{endLiters}
                     </when>
                     <otherwise>
                     </otherwise>