1

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/ErpBdOrg.java

@@ -39,4 +39,5 @@ public class ErpBdOrg implements Serializable {
     private String orgId;
 
 
+
 }

huimv-farm/src/main/java/vip/xiaonuo/money/controller/MoneyBusinessController.java

@@ -16,11 +16,10 @@ import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.hr.modular.baseemployeeinfo.entity.HrBaseEmployeeInfo;
 import vip.xiaonuo.hr.modular.baseemployeeinfo.param.HrBaseEmployeeInfoPageParam;
 import vip.xiaonuo.money.entity.MoneyBusiness;
-import vip.xiaonuo.money.param.MoneyAnalysisParam;
-import vip.xiaonuo.money.param.MoneyBusinessPageParam;
-import vip.xiaonuo.money.param.MoneyBusinessParam;
+import vip.xiaonuo.money.param.*;
 import vip.xiaonuo.money.service.IMoneyBusinessService;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -81,8 +80,37 @@ public class MoneyBusinessController {
 
     @ApiOperation("董事长页面指标卡")
     @PostMapping("/money/dsBusAll")
-    public CommonResult<Map<String ,String >> dsBusAll(@RequestBody MoneyAnalysisParam moneyAnalysisParam) {
-        Map<String ,String > map =  businessService.dsBusAll(moneyAnalysisParam);
-        return CommonResult.data(map);
+    public CommonResult< DsBusAllParam> dsBusAll(@RequestBody MoneyAnalysisParam moneyAnalysisParam) {
+        DsBusAllParam dsBusAllParam =  businessService.dsBusAll(moneyAnalysisParam);
+        return CommonResult.data(dsBusAllParam);
+    }
+
+    @ApiOperation("董事长页面营业收入，净利润，已交税金 详情")
+    @PostMapping("/money/getDsBusYyJlYjDetail")
+    public CommonResult<List<DsBusAllParam>> getDsBusYyJlYjDetail(@RequestBody DsBusParam dsBusParam) {
+        List<DsBusAllParam> endMap =  businessService.getDsBusYyJlYjDetail(dsBusParam);
+        return CommonResult.data(endMap);
+    }
+
+    @ApiOperation("董事长页面资余额")
+    @PostMapping("/money/getBalanceDetail")
+    public CommonResult<List<DsBusAllParam>> getBalanceDetail(@RequestBody DsBusParam dsBusParam) {
+        List<DsBusAllParam> endMap =  businessService.getBalanceDetail(dsBusParam);
+        return CommonResult.data(endMap);
+    }
+
+
+    @ApiOperation("董事长页面借款趋势")
+    @PostMapping("/money/getBorrowDetail")
+    public CommonResult<List<DsBusAllParam>> getBorrowDetail(@RequestBody DsBusParam dsBusParam) {
+        List<DsBusAllParam> endMap =  businessService.getBorrowDetail(dsBusParam);
+        return CommonResult.data(endMap);
+    }
+
+    @ApiOperation("董事长页面期间费用")
+    @PostMapping("/money/getMoneyDetail")
+    public CommonResult<List<DsBusSaleMoneyParam>> getMoneyDetail(@RequestBody DsBusParam dsBusParam) {
+        List<DsBusSaleMoneyParam> endMap =  businessService.getMoneyDetail(dsBusParam);
+        return CommonResult.data(endMap);
     }
 }

huimv-farm/src/main/java/vip/xiaonuo/money/mapper/MoneyBusinessMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Param;
 import vip.xiaonuo.money.entity.MoneyBusiness;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import vip.xiaonuo.money.param.DsBusAllParam;
 
 import java.util.List;
 
@@ -18,5 +19,17 @@ import java.util.List;
  */
 public interface MoneyBusinessMapper extends BaseMapper<MoneyBusiness> {
 
-    List<MoneyBusiness> dsBusAll(@Param(Constants.WRAPPER)  QueryWrapper<MoneyBusiness> wapper);
+    DsBusAllParam  dsBusAll(@Param(Constants.WRAPPER)  QueryWrapper<MoneyBusiness> wapper);
+
+    List<DsBusAllParam> getDsBusYyJlYjDetailMonth(@Param(Constants.WRAPPER) QueryWrapper<MoneyBusiness> wapper);
+
+    List<DsBusAllParam> getDsBusYyJlYjDetailYear(@Param(Constants.WRAPPER)QueryWrapper<MoneyBusiness> wapper);
+
+    List<DsBusAllParam> getBalanceDetailMonth(@Param(Constants.WRAPPER) QueryWrapper<MoneyBusiness> wapper);
+
+    List<DsBusAllParam> getBalanceDetailYear(@Param(Constants.WRAPPER)QueryWrapper<MoneyBusiness> wapper);
+
+    List<DsBusAllParam> getBorrowDetailMonth(@Param(Constants.WRAPPER)QueryWrapper<MoneyBusiness> wapper);
+
+    List<DsBusAllParam> getBorrowDetailYear(@Param(Constants.WRAPPER)QueryWrapper<MoneyBusiness> wapper);
 }

huimv-farm/src/main/java/vip/xiaonuo/money/mapper/MoneyCostMapper.java

@@ -1,7 +1,14 @@
 package vip.xiaonuo.money.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
+import vip.xiaonuo.money.entity.MoneyBusiness;
 import vip.xiaonuo.money.entity.MoneyCost;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import vip.xiaonuo.money.param.DsBusSaleMoneyParam;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +20,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MoneyCostMapper extends BaseMapper<MoneyCost> {
 
+    List<DsBusSaleMoneyParam> getMoneyDetailMonth(@Param(Constants.WRAPPER)QueryWrapper<MoneyBusiness> wapper);
+
+    List<DsBusSaleMoneyParam> getMoneyDetailYear(@Param(Constants.WRAPPER)QueryWrapper<MoneyBusiness> wapper);
 }

huimv-farm/src/main/java/vip/xiaonuo/money/param/DsBusAllParam.java

@@ -12,13 +12,19 @@ import java.util.Date;
 public class DsBusAllParam {
     @ApiModelProperty(value = "营业收入", position = 2)
     private String businessIncome;
+    @ApiModelProperty(value = "营业收入环比/同比", position = 2)
     private String businessIncomeOnYear;
+    @ApiModelProperty(value = "营业收入增加或者减少", position = 2)
+    private boolean businessIncomeIsOn;
 
     /**
      * 营业成本
      */
     @ApiModelProperty(value = "营业成本", position = 3)
     private String businessCost;
+    @ApiModelProperty(value = "营业成本环比/同比", position = 2)
+    private boolean businessCostIsOn;
+    @ApiModelProperty(value = "营业成本增加或者减少", position = 2)
     private String businessCostOnYear;
 
     /**
@@ -26,6 +32,9 @@ public class DsBusAllParam {
      */
     @ApiModelProperty(value = "净利润", position = 4)
     private String profit;
+    @ApiModelProperty(value = "净利润环比/同比", position = 2)
+    private boolean profitIsOn;
+    @ApiModelProperty(value = "净利润增加或者减少", position = 2)
     private String profitOnYear;
 
     /**
@@ -33,6 +42,9 @@ public class DsBusAllParam {
      */
     @ApiModelProperty(value = "已交税金", position = 5)
     private String taxes;
+    @ApiModelProperty(value = "已交税金环比/同比", position = 2)
+    private boolean taxesIsOn;
+    @ApiModelProperty(value = "已交税金增加或者减少", position = 2)
     private String taxesOnYear;
 
     /**
@@ -40,14 +52,26 @@ public class DsBusAllParam {
      */
     @ApiModelProperty(value = "当前资金余额", position = 6)
     private String balance;
+    @ApiModelProperty(value = "当前资金余额环比/同比", position = 2)
+    private boolean balanceIsOn;
+    @ApiModelProperty(value = "当前资金余额增加或者减少", position = 2)
     private String balanceOnYear;
 
     @ApiModelProperty(value = "银行借款金额", position = 6)
     private String borrowPrice;
+    @ApiModelProperty(value = "银行还款金额", position = 6)
+    private String repaymentPrice;
+    @ApiModelProperty(value = "银行借款金额环比/同比", position = 2)
+    private boolean borrowPriceIsOn;
+    @ApiModelProperty(value = "银行借款金额增加或者减少", position = 2)
     private String borrowPriceOnYear;
 
+    @ApiModelProperty(value = "应收金额", position = 6)
+    private String invoiceMoney;
+//    @JsonFormat(pattern = "yyyy-MM",timezone = "GMT+8")
+//    private Date mmonth;
 
-
+    private String ymonth;
 
 
 }

huimv-farm/src/main/java/vip/xiaonuo/money/param/DsBusParam.java

@@ -0,0 +1,17 @@
+package vip.xiaonuo.money.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class DsBusParam {
+    @ApiModelProperty(value = "orgId", required = true)
+    private String orgId;
+
+
+    @ApiModelProperty(value = "0月 1年", required = true)
+    @NotNull
+    private Integer type;
+}

huimv-farm/src/main/java/vip/xiaonuo/money/param/DsBusSaleMoneyParam.java

@@ -0,0 +1,15 @@
+package vip.xiaonuo.money.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class DsBusSaleMoneyParam {
+
+    private String ymonth;
+    private String  saleMoney;
+    private String  caiWuMoney;
+    private String  guanLiMoney;
+}

huimv-farm/src/main/java/vip/xiaonuo/money/service/IMoneyBusinessService.java

@@ -4,9 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import vip.xiaonuo.money.entity.MoneyBusiness;
 import com.baomidou.mybatisplus.extension.service.IService;
-import vip.xiaonuo.money.param.MoneyAnalysisParam;
-import vip.xiaonuo.money.param.MoneyBusinessPageParam;
-import vip.xiaonuo.money.param.MoneyBusinessParam;
+import vip.xiaonuo.money.param.*;
 
 import java.util.List;
 import java.util.Map;
@@ -39,5 +37,13 @@ public interface IMoneyBusinessService extends IService<MoneyBusiness> {
     //财务指标卡删除
     void deleteBusiness(MoneyBusiness business);
 
-    Map<String, String> dsBusAll(MoneyAnalysisParam moneyAnalysisParam);
+    DsBusAllParam dsBusAll(MoneyAnalysisParam moneyAnalysisParam);
+
+    List<DsBusAllParam> getDsBusYyJlYjDetail(DsBusParam dsBusParam);
+
+    List<DsBusAllParam> getBalanceDetail(DsBusParam dsBusParam);
+
+    List<DsBusAllParam> getBorrowDetail(DsBusParam dsBusParam);
+
+    List<DsBusSaleMoneyParam> getMoneyDetail(DsBusParam dsBusParam);
 }

huimv-farm/src/main/java/vip/xiaonuo/money/service/impl/MoneyBusinessServiceImpl.java

@@ -3,6 +3,7 @@ package vip.xiaonuo.money.service.impl;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.math.Money;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,13 +11,14 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import vip.xiaonuo.money.entity.MoneyBusiness;
+import vip.xiaonuo.money.entity.MoneyCost;
 import vip.xiaonuo.money.mapper.MoneyBusinessMapper;
-import vip.xiaonuo.money.param.MoneyAnalysisParam;
-import vip.xiaonuo.money.param.MoneyBusinessPageParam;
-import vip.xiaonuo.money.param.MoneyBusinessParam;
+import vip.xiaonuo.money.mapper.MoneyCostMapper;
+import vip.xiaonuo.money.param.*;
 import vip.xiaonuo.money.service.IMoneyBusinessService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import vip.xiaonuo.sale.mapper.SaleCostMapper;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -40,6 +42,9 @@ public class MoneyBusinessServiceImpl extends ServiceImpl<MoneyBusinessMapper, M
     @Autowired
     private MoneyBusinessMapper businessMapper;
 
+    @Autowired
+    private MoneyCostMapper moneyCostMapper;
+
     @Override
     public JSONArray listBusiness(MoneyBusinessParam moneyBusinessParam) {
         String orgId = moneyBusinessParam.getOrgId();
@@ -151,19 +156,146 @@ public class MoneyBusinessServiceImpl extends ServiceImpl<MoneyBusinessMapper, M
     }
 
     @Override
-    public Map<String, String> dsBusAll(MoneyAnalysisParam moneyAnalysisParam) {
+    public DsBusAllParam dsBusAll(MoneyAnalysisParam moneyAnalysisParam) {
         String orgId = moneyAnalysisParam.getOrgId();
         String time = moneyAnalysisParam.getTime();
         Date date ;
         if (StringUtils.isBlank(time)){
             date = DateUtil.beginOfMonth(new Date());
         }else {
-            date = DateUtil.beginOfMonth(DateUtil.parseDate(time));
+
+            date = DateUtil.beginOfMonth(   DateUtil.parse(time,"yyyy-MM"));
+        }
+        QueryWrapper<MoneyBusiness> wapper = new QueryWrapper<MoneyBusiness>();
+        wapper.eq(StringUtils.isNotBlank(orgId),"org_id", orgId).between("create_time", date, DateUtil.endOfMonth(date));
+        DsBusAllParam busAllParam =  businessMapper.dsBusAll(wapper);
+
+        wapper.clear();
+        wapper.eq(StringUtils.isNotBlank(orgId),"org_id", orgId)
+                .between("create_time", DateUtil.offsetMonth(date,-12), DateUtil.endOfMonth(DateUtil.offsetMonth(date,-12)));
+        DsBusAllParam lastBusAllParam =  businessMapper.dsBusAll(wapper);
+
+        //计算同比
+        busAllParam.setBalanceIsOn(getDouble(lastBusAllParam.getBalance()) <getDouble(busAllParam.getBalance()));
+        busAllParam.setProfitIsOn(getDouble(lastBusAllParam.getProfit()) <getDouble(busAllParam.getProfit()));
+        busAllParam.setTaxesIsOn(getDouble(lastBusAllParam.getTaxes()) <getDouble(busAllParam.getTaxes()));
+        busAllParam.setBusinessIncomeIsOn(getDouble(lastBusAllParam.getBusinessIncome()) <getDouble(busAllParam.getBusinessIncome()));
+        busAllParam.setBorrowPriceIsOn(getDouble(lastBusAllParam.getBorrowPrice()) <getDouble(busAllParam.getBorrowPrice()));
+
+        busAllParam.setBalanceOnYear(calculateYOYChange(getDouble(busAllParam.getBalance()),getDouble(lastBusAllParam.getBalance())));
+        busAllParam.setProfitOnYear(calculateYOYChange(getDouble(busAllParam.getProfit()),getDouble(lastBusAllParam.getProfit())));
+        busAllParam.setTaxesOnYear(calculateYOYChange(getDouble(busAllParam.getTaxes()),getDouble(lastBusAllParam.getTaxes())));
+        busAllParam.setBusinessIncomeOnYear(calculateYOYChange(getDouble(busAllParam.getBusinessIncome()),getDouble(lastBusAllParam.getBusinessIncome())));
+        busAllParam.setBorrowPriceOnYear(calculateYOYChange(getDouble(busAllParam.getBorrowPrice()),getDouble(lastBusAllParam.getBorrowPrice())));
+
+
+        return busAllParam;
+    }
+
+    private Double getDouble(String balance) {
+        if (StringUtils.isBlank(balance)){
+            return 0.0;
+        }
+        return Double.parseDouble(balance);
+//        return  balance;
+    }
+
+    @Override
+    public  List<DsBusAllParam> getDsBusYyJlYjDetail(DsBusParam dsBusParam) {
+        String orgId = dsBusParam.getOrgId();
+        Integer type = dsBusParam.getType();
+        QueryWrapper<MoneyBusiness> wapper = new QueryWrapper<MoneyBusiness>();
+        wapper.eq(StringUtils.isNotBlank(orgId),"org_id", orgId).orderByAsc("create_time").groupBy("ymonth");
+        List<DsBusAllParam> busAllParams;
+        if (ObjectUtil.isEmpty(type) || 0 ==  type){
+            busAllParams = businessMapper.getDsBusYyJlYjDetailMonth(wapper);
+        }else {
+            busAllParams = businessMapper.getDsBusYyJlYjDetailYear(wapper);
         }
+        return busAllParams;
+    }
+
+    @Override
+    public List<DsBusAllParam> getBalanceDetail(DsBusParam dsBusParam) {
+        String orgId = dsBusParam.getOrgId();
+        Integer type = dsBusParam.getType();
         QueryWrapper<MoneyBusiness> wapper = new QueryWrapper<MoneyBusiness>();
-        wapper.eq("org_id", StringUtils.isNotBlank(orgId)).between("create_time", date, DateUtil.endOfMonth(date));
-//        MoneyBusiness moneyBusinesses =  businessMapper.dsBusAll(wapper);
+        wapper.eq( StringUtils.isNotBlank(orgId),"org_id", orgId).orderByAsc("create_time").groupBy("ymonth");
+        List<DsBusAllParam> busAllParams;
+        if (ObjectUtil.isEmpty(type) || 0 ==  type){
+            busAllParams = businessMapper.getBalanceDetailMonth(wapper);
+        }else {
+            busAllParams = businessMapper.getBalanceDetailYear(wapper);
+        }
+        for (int i = 0; i < busAllParams.size() -1 ; i++) {
+            DsBusAllParam  lastDsBus  = busAllParams.get(i);
+            DsBusAllParam dsBusAllParam = busAllParams.get(i + 1);
+            dsBusAllParam.setBalanceOnYear(calculateYOYZiJinYvE(getDouble(dsBusAllParam.getBalance()),getDouble(lastDsBus.getBalance()) ));
+            dsBusAllParam.setBalanceIsOn(getDouble(lastDsBus.getBalance()) <getDouble(dsBusAllParam.getBalance()));
+        }
+        DsBusAllParam dsBusAllParam = busAllParams.get(0);
+        dsBusAllParam.setBalanceIsOn(true);
+        dsBusAllParam.setBalanceOnYear("0%");
 
-        return null;
+
+        return busAllParams;
+    }
+
+    @Override
+    public List<DsBusAllParam> getBorrowDetail(DsBusParam dsBusParam) {
+        String orgId = dsBusParam.getOrgId();
+        Integer type = dsBusParam.getType();
+        QueryWrapper<MoneyBusiness> wapper = new QueryWrapper<MoneyBusiness>();
+        wapper.eq( StringUtils.isNotBlank(orgId),"org_id", orgId).orderByAsc("borrow_time").groupBy("ymonth");
+        List<DsBusAllParam> busAllParams;
+        if (ObjectUtil.isEmpty(type) || 0 ==  type){
+            busAllParams = businessMapper.getBorrowDetailMonth(wapper);
+        }else {
+            busAllParams = businessMapper.getBorrowDetailYear(wapper);
+        }
+        return busAllParams;
+    }
+
+
+
+    @Override
+    public List<DsBusSaleMoneyParam> getMoneyDetail(DsBusParam dsBusParam) {
+        String orgId = dsBusParam.getOrgId();
+        Integer type = dsBusParam.getType();
+        QueryWrapper<MoneyBusiness> wapper = new QueryWrapper<MoneyBusiness>();
+        wapper.eq( StringUtils.isNotBlank(orgId),"org_id", orgId).orderByAsc("create_time").groupBy("ymonth");
+        List<DsBusSaleMoneyParam> busAllParams;
+        if (ObjectUtil.isEmpty(type) || 0 ==  type){
+            busAllParams = moneyCostMapper.getMoneyDetailMonth(wapper);
+        }else {
+            busAllParams = moneyCostMapper.getMoneyDetailYear(wapper);
+        }
+        return busAllParams;
+    }
+
+    public static String calculateYOYChange(double currentValue, double previousValue) {
+        // 处理零值情况
+        if (previousValue == 0) {
+            return "0%";
+        }
+        // 计算同比变化率
+        double percentageChange = (Math.abs((currentValue - previousValue) / previousValue)) * 100;
+        if (percentageChange >200){
+            return "100%";
+        }
+        return String.format("%.2f%%", percentageChange);
+    }
+
+    public static String calculateYOYZiJinYvE(double currentValue, double previousValue) {
+        // 处理零值情况
+        if (previousValue == 0) {
+            return "0%";
+        }
+        // 计算同比变化率
+        double percentageChange = ((currentValue - previousValue) /previousValue) * 100;
+        if (percentageChange >200){
+            return "100%";
+        }
+        return String.format("%.2f%%", percentageChange);
     }
 }

huimv-farm/src/main/java/vip/xiaonuo/sale/entity/SaleTarget.java

@@ -81,5 +81,7 @@ public class SaleTarget implements Serializable {
     @ApiModelProperty(value = "组织id",position =8 )
     private String orgId;
 
+    private String customerName;
+
 
 }

huimv-farm/src/main/java/vip/xiaonuo/sale/mapper/SaleCostMapper.java

@@ -1,8 +1,13 @@
 package vip.xiaonuo.sale.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import vip.xiaonuo.money.entity.MoneyBusiness;
+import vip.xiaonuo.money.param.DsBusSaleMoneyParam;
 import vip.xiaonuo.sale.entity.SaleCost;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 销售费用 Mapper 接口
@@ -13,4 +18,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SaleCostMapper extends BaseMapper<SaleCost> {
 
+    List<DsBusSaleMoneyParam> getMoneyDetailMonth(QueryWrapper<MoneyBusiness> wapper);
+
+    List<DsBusSaleMoneyParam> getMoneyDetailYear(QueryWrapper<MoneyBusiness> wapper);
 }

huimv-farm/src/main/resources/mapper/MoneyBusinessMapper.xml

@@ -3,17 +3,95 @@
 <mapper namespace="vip.xiaonuo.money.mapper.MoneyBusinessMapper">
 
 
-    <select id="dsBusAll" resultType="vip.xiaonuo.money.entity.MoneyBusiness">
+    <select id="dsBusAll" resultType="vip.xiaonuo.money.param.DsBusAllParam">
       SELECT
     id,
     org_id,
-    ROUND(IFNULL(SUM(business_income), 0), 2) AS business_income,
-    ROUND(IFNULL(SUM(business_cost), 0), 2) AS business_cost,
-    ROUND(IFNULL(SUM(profit), 0), 2) AS profit,
-    ROUND(IFNULL(SUM(taxes), 0), 2) AS taxes,
-    ROUND(IFNULL(SUM(balance), 0), 2) AS balance
+    ROUND(IFNULL(SUM(business_income) , 0)/10000, 2) AS business_income,
+--     ROUND(IFNULL(SUM(business_cost), 0), 2) AS business_cost,
+    ROUND(IFNULL(SUM(profit), 0)/10000, 2) AS profit,
+    ROUND(IFNULL(SUM(taxes), 0)/10000, 2) AS taxes,
+    ROUND(IFNULL(SUM(balance), 0)/10000, 2) AS balance,
+   ROUND(IFNULL( (SELECT SUM(borrow_price)
+     FROM `money_borrow_warning`  ${ew.customSqlSegment} ), 0)/10000, 2) AS borrow_price
 FROM
     `money_business`
      ${ew.customSqlSegment}
     </select>
+    <select id="getDsBusYyJlYjDetailMonth" resultType="vip.xiaonuo.money.param.DsBusAllParam">
+        SELECT
+    DATE_FORMAT(create_time, '%Y-%m') AS ymonth, -- 提取年份和月份
+    org_id,
+    ROUND(IFNULL(SUM(business_income), 0)/10000, 2) AS business_income,
+   -- ROUND(IFNULL(SUM(business_cost), 0), 2) AS business_cost,
+    ROUND(IFNULL(SUM(profit), 0)/10000, 2) AS profit,
+    ROUND(IFNULL(SUM(taxes), 0)/10000, 2) AS taxes
+    -- ROUND(IFNULL(SUM(balance), 0), 2) AS balance,
+FROM
+    `money_business`
+     ${ew.customSqlSegment}
+-- 根据月份和组织ID进行分组
+
+    </select>
+    <select id="getDsBusYyJlYjDetailYear" resultType="vip.xiaonuo.money.param.DsBusAllParam">
+         SELECT
+    DATE_FORMAT(create_time, '%Y') AS ymonth, -- 提取年份和月份
+    org_id,
+    ROUND(IFNULL(SUM(business_income), 0)/10000, 2) AS business_income,
+   -- ROUND(IFNULL(SUM(business_cost), 0), 2) AS business_cost,
+    ROUND(IFNULL(SUM(profit), 0)/10000, 2) AS profit,
+    ROUND(IFNULL(SUM(taxes), 0)/10000, 2) AS taxes
+    -- ROUND(IFNULL(SUM(balance), 0), 2) AS balance,
+FROM
+    `money_business`
+-- 根据月份和组织ID进行分组
+     ${ew.customSqlSegment}
+    </select>
+    <select id="getBalanceDetailMonth" resultType="vip.xiaonuo.money.param.DsBusAllParam">
+         SELECT
+    DATE_FORMAT(create_time, '%Y-%m') AS ymonth,
+     ROUND(IFNULL(SUM(balance), 0)/10000, 2) AS balance
+FROM
+    `money_business`
+     ${ew.customSqlSegment}
+
+
+    </select>
+    <select id="getBalanceDetailYear" resultType="vip.xiaonuo.money.param.DsBusAllParam">
+         SELECT
+    DATE_FORMAT(create_time, '%Y') AS ymonth,
+     ROUND(IFNULL(SUM(balance), 0)/10000, 2) AS balance
+FROM
+    `money_business`
+     ${ew.customSqlSegment}
+
+
+    </select>
+    <select id="getBorrowDetailMonth" resultType="vip.xiaonuo.money.param.DsBusAllParam">
+          SELECT ROUND(IFNULL(SUM(borrow_price), 0)/10000, 2)  borrow_price , DATE_FORMAT(borrow_time, '%Y-%m') AS ymonth ,
+       (
+        SELECT ROUND(IFNULL(SUM(borrow_price), 0)/10000, 2)
+        FROM `money_borrow_warning`
+        WHERE DATE_FORMAT(repayment_time, '%Y-%m') = DATE_FORMAT(mb.borrow_price, '%Y-%m')
+       
+    ) AS repaymentPrice 
+       
+        FROM `money_borrow_warning` mb
+         ${ew.customSqlSegment}
+
+    </select>
+    <select id="getBorrowDetailYear" resultType="vip.xiaonuo.money.param.DsBusAllParam">
+           SELECT ROUND(IFNULL(SUM(borrow_price), 0)/10000, 2)  borrow_price , DATE_FORMAT(borrow_time, '%Y') AS ymonth ,
+       (
+        SELECT ROUND(IFNULL(SUM(borrow_price), 0)/10000, 2)
+        FROM `money_borrow_warning`
+        WHERE DATE_FORMAT(repayment_time, '%Y') = DATE_FORMAT(mb.borrow_price, '%Y') -- 确保与主查询的月份相匹配
+       
+    ) AS repaymentPrice 
+       
+        FROM `money_borrow_warning` mb
+         ${ew.customSqlSegment}
+
+    </select>
+
 </mapper>

huimv-farm/src/main/resources/mapper/MoneyCostMapper.xml

@@ -2,4 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="vip.xiaonuo.money.mapper.MoneyCostMapper">
 
+    <select id="getMoneyDetailMonth" resultType="vip.xiaonuo.money.param.DsBusSaleMoneyParam">
+   SELECT ROUND(IFNULL(SUM(sale), 0)/10000, 2)  saleMoney ,  ROUND(IFNULL(SUM(manage), 0)/10000, 2)   guanLiMoney , ROUND(IFNULL(SUM(finance), 0)/10000, 2)  caiWuMoney ,
+   DATE_FORMAT(create_time, '%Y-%m') AS ymonth
+        FROM `money_cost`
+           ${ew.customSqlSegment}
+
+    </select>
+
+
+    <select id="getMoneyDetailYear" resultType="vip.xiaonuo.money.param.DsBusSaleMoneyParam">
+   SELECT ROUND(IFNULL(SUM(sale), 0)/10000, 2)  saleMoney ,  ROUND(IFNULL(SUM(manage), 0)/10000, 2)   guanLiMoney , ROUND(IFNULL(SUM(finance), 0)/10000, 2)  caiWuMoney ,
+   DATE_FORMAT(create_time, '%Y') AS ymonth
+        FROM `money_cost`
+           ${ew.customSqlSegment}
+
+
+    </select>
 </mapper>

huimv-farm/src/main/resources/mapper/SaleCostMapper.xml

@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="vip.xiaonuo.sale.mapper.SaleCostMapper">
 
+    <select id="getMoneyDetailMonth" resultType="vip.xiaonuo.money.param.DsBusSaleMoneyParam">
+
+
+    </select>
+    <select id="getMoneyDetailYear" resultType="vip.xiaonuo.money.param.DsBusSaleMoneyParam">
+
+
+    </select>
 </mapper>

huimv-farm/src/test/java/vip/xiaonuo/MainTest.java

@@ -96,12 +96,12 @@ public class MainTest {
             ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFPURCHASEORGID()));
             if (ObjectUtil.isEmpty(forgid))
                 continue;
-//            PurchasePrice purchasePrice = new PurchasePrice();
-//            purchasePrice.setCreateTime(forObject.getFDATE());
-//            purchasePrice.setMaterial(forObject.getFname());
-//            purchasePrice.setOrgId(forgid.getOrgId());
-//            purchasePrice.setPrice(String.format("%.2f",forObject.getDanJia()));
-//            priceMapper.insert(purchasePrice);
+            PurchasePrice purchasePrice = new PurchasePrice();
+            purchasePrice.setCreateTime(forObject.getFDATE());
+            purchasePrice.setMaterial(forObject.getFname());
+            purchasePrice.setOrgId(forgid.getOrgId());
+            purchasePrice.setPrice(String.format("%.2f",forObject.getDanJia()));
+            priceMapper.insert(purchasePrice);
 //
             Date fdate = forObject.getFDATE();
             PurchaseOrder purchaseOrder = orderMapper.selectOne(new QueryWrapper<PurchaseOrder>().eq("org_id", forgid.getOrgId())
@@ -118,13 +118,13 @@ public class MainTest {
                 purchaseOrder.setSupplier(forObject.getGys());
                 orderMapper.insert(purchaseOrder);
             }else {
-//                purchaseOrder.setCreateTime(forObject.getFDATE());
-//                purchaseOrder.setMaterial(forObject.getFname());
-//                purchaseOrder.setOrgId(forgid.getOrgId());
+                purchaseOrder.setCreateTime(forObject.getFDATE());
+                purchaseOrder.setMaterial(forObject.getFname());
+                purchaseOrder.setOrgId(forgid.getOrgId());
                 purchaseOrder.setSupplier(forObject.getGys());
-//                purchaseOrder.setPurchaseMoney(String.format("%.2f",forObject.getFALLAMOUNT()));
-//                purchaseOrder.setMaterialAcceptNumber(String.format("%.2f",forObject.getFQTY()));
-//                purchaseOrder.setMaterialAcceptPrice(String.format("%.2f",forObject.getFALLAMOUNT()));
+                purchaseOrder.setPurchaseMoney(String.format("%.2f",forObject.getFALLAMOUNT()));
+                purchaseOrder.setMaterialAcceptNumber(String.format("%.2f",forObject.getFQTY()));
+                purchaseOrder.setMaterialAcceptPrice(String.format("%.2f",forObject.getFALLAMOUNT()));
                 orderMapper.updateById(purchaseOrder);
             }
         }

huimv-farm/src/test/java/vip/xiaonuo/XiaoShouTest.java

@@ -16,6 +16,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.junit.Test;
+import org.junit.platform.commons.util.StringUtils;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -31,8 +32,10 @@ import vip.xiaonuo.erp.entity.kucun.WuLiaoKuMingXi;
 import vip.xiaonuo.erp.entity.kucun.YuanCaiLiaoKuCun;
 import vip.xiaonuo.erp.entity.xiaoshou.*;
 import vip.xiaonuo.erp.mapper.ErpBdOrgMapper;
+import vip.xiaonuo.money.entity.MoneyCost;
 import vip.xiaonuo.money.entity.MoneyOverdue;
 import vip.xiaonuo.money.entity.MoneyProduce;
+import vip.xiaonuo.money.mapper.MoneyCostMapper;
 import vip.xiaonuo.money.mapper.MoneyOverdueMapper;
 import vip.xiaonuo.money.mapper.MoneyProduceMapper;
 import vip.xiaonuo.sale.entity.*;
@@ -79,6 +82,8 @@ public class XiaoShouTest {
 
     @Autowired
     private SaleOrderMapper orderMapper;
+    @Autowired
+    private MoneyCostMapper moneyCostMapper;
 
 
     @Autowired
@@ -162,14 +167,22 @@ public class XiaoShouTest {
             ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFacctorgid()));
             if (ObjectUtil.isEmpty(forgid))
                 continue;
-            SaleCost saleCost = new SaleCost();
-            saleCost.setCreateTime(forObject.getFDATE());
-            saleCost.setOrgId(forgid.getOrgId());
-            saleCost.setSaleCostMoney(String.format("%.2f",forObject.getFCREDIT()));
-            saleCost.setSaleCostName(forObject.getFname());
-            costMapper.insert(saleCost);
+//            SaleCost saleCost = new SaleCost();
+//            saleCost.setCreateTime(forObject.getFDATE());
+//            saleCost.setOrgId(forgid.getOrgId());
+//            saleCost.setSaleCostMoney(String.format("%.2f",forObject.getFCREDIT()));
+//            saleCost.setSaleCostName(forObject.getFname());
+//            costMapper.insert(saleCost);
+            MoneyCost moneyCost = new MoneyCost();
+            moneyCost.setCreateTime(forObject.getFDATE());
+            moneyCost.setOrgId(forgid.getOrgId());
+            moneyCost.setSale(String.format("%.2f",forObject.getFCREDIT()));
+            moneyCost.setCompany(forgid.getFname());
+            moneyCostMapper.insert(moneyCost);
         }
 
+
+
     }
 
     @Test
@@ -283,11 +296,27 @@ public class XiaoShouTest {
                 continue;
             SaleTarget saleTarget = new SaleTarget();
             saleTarget.setOrgId(forgid.getOrgId());
-            saleTarget.setVisitNumber("1");
+            saleTarget.setVisitNumber(getNum(forObject));
+
             saleTarget.setCreateTime(forObject.getFZCDATE());
+            saleTarget.setCustomerName(forObject.getFZCREMARKS());
             targetMapper.insert(saleTarget);
         }
     }
 
+    private String getNum(BaiFangKeHu forObject) {
+        if (StringUtils.isBlank(forObject.getFZCREMARKS2())){
+            return "1";
+        }else if (StringUtils.isBlank(forObject.getFZCREMARKS3())){
+            return "2";
+        } else if (StringUtils.isBlank(forObject.getFZCREMARKS4())){
+            return "3";
+        }else if (StringUtils.isNotBlank(forObject.getFZCREMARKS4())){
+            return "4";
+        }else {
+            return "1";
+        }
+    }
+
 
 }

snowy-plugin/snowy-plugin-sys/target/maven-archiver/pom.properties

@@ -1,4 +1,11 @@
+<<<<<<< Updated upstream
 #Created by Apache Maven 3.6.1
 version=2.0.0
 groupId=vip.xiaonuo
 artifactId=snowy-plugin-sys
+=======
+#Created by Apache Maven 3.6.3
+groupId=vip.xiaonuo
+artifactId=snowy-plugin-sys
+version=2.0.0
+>>>>>>> Stashed changes

snowy-plugin/snowy-plugin-sys/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,169 @@
+vip\xiaonuo\sys\modular\org\param\SysOrgPageParam.class
+vip\xiaonuo\sys\modular\resource\param\menu\SysMenuAddParam.class
+vip\xiaonuo\sys\modular\user\result\SysUserGrantResourceTreeResult.class
+vip\xiaonuo\sys\modular\position\controller\SysPositionController.class
+vip\xiaonuo\sys\modular\position\param\SysPositionIdParam.class
+vip\xiaonuo\sys\modular\org\param\SysOrgIdParam.class
+vip\xiaonuo\sys\modular\resource\enums\SysResourceMenuTypeEnum.class
+vip\xiaonuo\sys\modular\index\param\SysIndexMessageIdParam.class
+vip\xiaonuo\sys\modular\index\param\SysIndexMessageListParam.class
+vip\xiaonuo\sys\modular\index\result\SysIndexMessageListResult.class
+vip\xiaonuo\sys\modular\position\mapper\SysPositionMapper.class
+vip\xiaonuo\sys\modular\org\param\SysOrgEditParam.class
+vip\xiaonuo\sys\modular\org\param\SysOrgAddParam.class
+vip\xiaonuo\sys\modular\user\param\SysUserEditParam.class
+vip\xiaonuo\sys\modular\relation\service\SysRelationService.class
+vip\xiaonuo\sys\modular\user\service\impl\SysUserServiceImpl$2.class
+vip\xiaonuo\sys\modular\position\entity\SysPosition.class
+vip\xiaonuo\sys\modular\resource\entity\SysMenu.class
+vip\xiaonuo\sys\modular\user\param\SysUserFindPwdByEmailParam.class
+vip\xiaonuo\sys\core\enums\SysDataTypeEnum.class
+vip\xiaonuo\sys\modular\user\controller\SysUserCenterController.class
+vip\xiaonuo\sys\modular\user\service\SysUserService.class
+vip\xiaonuo\sys\modular\role\enums\SysRoleCategoryEnum.class
+vip\xiaonuo\sys\modular\user\result\SysUserOwnPermissionResult.class
+vip\xiaonuo\sys\modular\user\provider\SysLoginUserApiProvider.class
+vip\xiaonuo\sys\modular\index\service\SysIndexService.class
+vip\xiaonuo\sys\modular\org\entity\SysOrg.class
+vip\xiaonuo\sys\modular\resource\param\button\SysButtonIdParam.class
+vip\xiaonuo\sys\modular\role\param\SysRoleEditParam.class
+vip\xiaonuo\sys\modular\role\param\SysRoleGrantPermissionParam.class
+vip\xiaonuo\sys\modular\user\result\SysUserPositionResult.class
+vip\xiaonuo\sys\modular\user\param\SysUserGrantPermissionParam$SysUserGrantPermission.class
+vip\xiaonuo\sys\modular\index\param\SysIndexScheduleIdParam.class
+vip\xiaonuo\sys\modular\resource\param\menu\SysMenuTreeParam.class
+vip\xiaonuo\sys\modular\resource\param\module\SysModuleAddParam.class
+vip\xiaonuo\sys\modular\index\controller\SysIndexController.class
+vip\xiaonuo\sys\modular\index\result\SysIndexScheduleListResult.class
+vip\xiaonuo\sys\modular\user\enums\SysUserStatusEnum.class
+vip\xiaonuo\sys\modular\user\param\SysUserExportParam.class
+vip\xiaonuo\sys\modular\user\param\SysUserAddParam.class
+vip\xiaonuo\sys\modular\user\result\SysUserOwnResourceResult.class
+vip\xiaonuo\sys\modular\role\param\SysRoleIdParam.class
+vip\xiaonuo\sys\modular\role\param\SysRoleGrantResourceParam$SysRoleGrantResource.class
+vip\xiaonuo\sys\modular\resource\service\impl\SysModuleServiceImpl.class
+vip\xiaonuo\sys\modular\role\result\SysRoleGrantResourceTreeResult.class
+vip\xiaonuo\sys\modular\resource\param\module\SysModulePageParam.class
+vip\xiaonuo\sys\modular\role\param\SysRoleGrantUserParam.class
+vip\xiaonuo\sys\modular\user\result\SysLoginUser.class
+vip\xiaonuo\sys\modular\index\service\impl\SysIndexServiceImpl.class
+vip\xiaonuo\sys\modular\role\entity\SysRole.class
+vip\xiaonuo\sys\modular\user\service\impl\SysUserServiceImpl.class
+vip\xiaonuo\sys\modular\resource\param\button\SysButtonAddParam.class
+vip\xiaonuo\sys\modular\role\param\SysRoleGrantMobileMenuParam$SysRoleGrantMobileMenu.class
+vip\xiaonuo\sys\core\config\SysConfigure.class
+vip\xiaonuo\sys\modular\position\enums\SysPositionCategoryEnum.class
+vip\xiaonuo\sys\modular\position\param\SysPositionSelectorPositionParam.class
+vip\xiaonuo\sys\modular\role\result\SysRoleOwnPermissionResult$SysRoleOwnPermission.class
+vip\xiaonuo\sys\modular\user\param\SysUserGetPhoneValidCodeParam.class
+vip\xiaonuo\sys\modular\user\param\SysUserPageParam.class
+vip\xiaonuo\sys\modular\user\result\SysUserResult.class
+vip\xiaonuo\sys\modular\resource\param\menu\SysMenuSelectorMenuParam.class
+vip\xiaonuo\sys\modular\role\provider\SysRoleApiProvider.class
+vip\xiaonuo\sys\modular\user\controller\SysUserController.class
+vip\xiaonuo\sys\modular\role\controller\SysRoleController.class
+vip\xiaonuo\sys\modular\user\param\SysUserUpdateWorkbenchParam.class
+vip\xiaonuo\sys\modular\user\param\SysUserUpdateInfoParam.class
+vip\xiaonuo\sys\modular\user\result\SysUserOwnResourceResult$SysUserOwnResource.class
+vip\xiaonuo\sys\modular\org\controller\SysOrgController.class
+vip\xiaonuo\sys\modular\resource\controller\SysButtonController.class
+vip\xiaonuo\sys\modular\role\param\SysRoleSelectorUserParam.class
+vip\xiaonuo\sys\modular\index\param\SysIndexScheduleListParam.class
+vip\xiaonuo\sys\modular\resource\service\impl\SysMenuServiceImpl.class
+vip\xiaonuo\sys\modular\role\param\SysRoleSelectorRoleParam.class
+vip\xiaonuo\sys\modular\resource\service\impl\SysButtonServiceImpl.class
+vip\xiaonuo\sys\modular\resource\service\SysModuleService.class
+vip\xiaonuo\sys\modular\role\result\SysRoleGrantResourceTreeResult$SysRoleGrantResourceMenuResult$SysRoleGrantResourceButtonResult.class
+vip\xiaonuo\sys\modular\relation\enums\SysRelationCategoryEnum.class
+vip\xiaonuo\sys\modular\role\result\SysRoleOwnMobileMenuResult$SysRoleOwnMobileMenu.class
+vip\xiaonuo\sys\modular\user\param\SysUserSelectorPositionParam.class
+vip\xiaonuo\sys\modular\role\service\impl\SysRoleServiceImpl.class
+vip\xiaonuo\sys\modular\resource\param\menu\SysMenuPageParam.class
+vip\xiaonuo\sys\modular\relation\mapper\SysRelationMapper.class
+vip\xiaonuo\sys\modular\role\result\SysRoleOwnResourceResult$SysRoleOwnResource.class
+vip\xiaonuo\sys\modular\role\result\SysRoleGrantResourceTreeResult$SysRoleGrantResourceMenuResult.class
+vip\xiaonuo\sys\modular\user\param\SysUserGetEmailValidCodeParam.class
+vip\xiaonuo\sys\modular\user\param\SysUserGrantResourceParam.class
+vip\xiaonuo\sys\modular\role\service\SysRoleService.class
+vip\xiaonuo\sys\modular\resource\param\button\SysButtonPageParam.class
+vip\xiaonuo\sys\core\listener\SysDataChangeListener.class
+vip\xiaonuo\sys\modular\resource\param\button\SysButtonEditParam.class
+vip\xiaonuo\sys\modular\index\result\SysIndexVisLogListResult.class
+vip\xiaonuo\sys\modular\user\result\SysUserGrantResourceTreeResult$SysUserGrantResourceMenuResult$SysUserGrantResourceButtonResult.class
+vip\xiaonuo\sys\modular\position\service\SysPositionService.class
+vip\xiaonuo\sys\modular\role\enums\SysRoleDataScopeCategoryEnum.class
+vip\xiaonuo\sys\modular\user\mapper\SysUserMapper.class
+vip\xiaonuo\sys\modular\role\result\SysRoleGrantMobileMenuTreeResult.class
+vip\xiaonuo\sys\modular\position\param\SysPositionAddParam.class
+vip\xiaonuo\sys\modular\resource\controller\SysModuleController.class
+vip\xiaonuo\sys\modular\resource\mapper\SysMenuMapper.class
+vip\xiaonuo\sys\modular\role\result\SysRoleOwnResourceResult.class
+vip\xiaonuo\sys\modular\user\result\SysUserOwnPermissionResult$SysUserOwnPermission.class
+vip\xiaonuo\sys\modular\user\result\SysUserExportResult.class
+vip\xiaonuo\sys\modular\resource\enums\SysResourceCategoryEnum.class
+vip\xiaonuo\sys\core\enums\SysBuildInEnum.class
+vip\xiaonuo\sys\modular\resource\param\menu\SysMenuChangeModuleParam.class
+vip\xiaonuo\sys\modular\relation\entity\SysRelation.class
+vip\xiaonuo\sys\modular\org\param\SysOrgSelectorUserParam.class
+vip\xiaonuo\sys\modular\position\service\impl\SysPositionServiceImpl.class
+vip\xiaonuo\sys\modular\relation\service\impl\SysRelationServiceImpl.class
+vip\xiaonuo\sys\modular\resource\service\SysMenuService.class
+vip\xiaonuo\sys\modular\user\result\SysUserMessageDetailResult.class
+vip\xiaonuo\sys\modular\position\param\SysPositionPageParam.class
+vip\xiaonuo\sys\modular\user\result\SysUserMessageDetailResult$DevReceiveInfo.class
+vip\xiaonuo\sys\modular\user\param\SysUserUpdatePwdParam.class
+vip\xiaonuo\sys\modular\user\provider\SysUserApiProvider.class
+vip\xiaonuo\sys\modular\user\param\SysUserMessagePageParam.class
+vip\xiaonuo\sys\modular\role\result\SysRoleGrantMobileMenuTreeResult$SysRoleGrantMobileMenuResult$SysRoleGrantMobileButtonResult.class
+vip\xiaonuo\sys\modular\role\param\SysRoleAddParam.class
+vip\xiaonuo\sys\modular\user\service\impl\SysUserServiceImpl$1.class
+vip\xiaonuo\sys\modular\org\mapper\SysOrgMapper.class
+vip\xiaonuo\sys\modular\resource\param\menu\SysMenuEditParam.class
+vip\xiaonuo\sys\modular\user\entity\SysUser.class
+vip\xiaonuo\sys\modular\resource\provider\SysButtonApiProvider.class
+vip\xiaonuo\sys\modular\resource\entity\SysButton.class
+vip\xiaonuo\sys\modular\user\param\SysUserImportParam.class
+vip\xiaonuo\sys\modular\user\param\SysUserFindPwdByPhoneParam.class
+vip\xiaonuo\sys\modular\role\param\SysRolePageParam.class
+vip\xiaonuo\sys\modular\index\result\SysIndexMessageDetailResult$DevReceiveInfo.class
+vip\xiaonuo\sys\modular\resource\entity\SysModule.class
+vip\xiaonuo\sys\modular\user\param\SysUserIdListParam.class
+vip\xiaonuo\sys\modular\org\param\SysOrgSelectorOrgListParam.class
+vip\xiaonuo\sys\modular\resource\controller\SysMenuController.class
+vip\xiaonuo\sys\modular\resource\param\menu\SysMenuIdParam.class
+vip\xiaonuo\sys\modular\index\result\SysIndexMessageDetailResult.class
+vip\xiaonuo\sys\modular\org\service\SysOrgService.class
+vip\xiaonuo\sys\modular\org\enums\SysOrgCategoryEnum.class
+vip\xiaonuo\sys\modular\role\result\SysRoleGrantMobileMenuTreeResult$SysRoleGrantMobileMenuResult.class
+vip\xiaonuo\sys\modular\resource\param\module\SysModuleEditParam.class
+vip\xiaonuo\sys\modular\user\param\SysUserGrantRoleParam.class
+vip\xiaonuo\sys\modular\index\result\SysIndexOpLogListResult.class
+vip\xiaonuo\sys\modular\user\param\SysUserGrantResourceParam$SysUserGrantResource.class
+vip\xiaonuo\sys\modular\role\result\SysRoleOwnMobileMenuResult.class
+vip\xiaonuo\sys\modular\role\result\SysRoleOwnPermissionResult.class
+vip\xiaonuo\sys\modular\user\result\SysUserPicValidCodeResult.class
+vip\xiaonuo\sys\modular\resource\provider\SysMenuApiProvider.class
+vip\xiaonuo\sys\modular\org\provider\SysOrgApiProvider.class
+vip\xiaonuo\sys\modular\user\param\SysUserSelectorOrgListParam.class
+vip\xiaonuo\sys\modular\user\param\SysUserSelectorRoleParam.class
+vip\xiaonuo\sys\modular\role\param\SysRoleGrantMobileMenuParam.class
+vip\xiaonuo\sys\modular\role\param\SysRoleGrantResourceParam.class
+vip\xiaonuo\sys\modular\position\param\SysPositionEditParam.class
+vip\xiaonuo\sys\modular\user\param\SysUserMessageIdParam.class
+vip\xiaonuo\sys\modular\user\param\SysUserSelectorUserParam.class
+vip\xiaonuo\sys\modular\role\mapper\SysRoleMapper.class
+vip\xiaonuo\sys\modular\resource\mapper\SysButtonMapper.class
+vip\xiaonuo\sys\modular\user\param\SysUserSignatureParam.class
+vip\xiaonuo\sys\modular\index\param\SysIndexScheduleAddParam.class
+vip\xiaonuo\sys\modular\org\service\impl\SysOrgServiceImpl.class
+vip\xiaonuo\sys\modular\user\result\SysUserMessageResult.class
+vip\xiaonuo\sys\modular\resource\mapper\SysModuleMapper.class
+vip\xiaonuo\sys\modular\relation\provider\SysRelationApiProvider.class
+vip\xiaonuo\sys\modular\role\param\SysRoleGrantPermissionParam$SysRoleGrantPermission.class
+vip\xiaonuo\sys\modular\user\result\SysUserGrantResourceTreeResult$SysUserGrantResourceMenuResult.class
+vip\xiaonuo\sys\modular\resource\param\module\SysModuleIdParam.class
+vip\xiaonuo\sys\modular\user\param\SysUserGrantPermissionParam.class
+vip\xiaonuo\sys\modular\resource\param\menu\SysMenuSelectorModuleParam.class
+vip\xiaonuo\sys\modular\position\provider\SysPositionApiProvider.class
+vip\xiaonuo\sys\modular\user\param\SysUserIdParam.class
+vip\xiaonuo\sys\modular\resource\service\SysButtonService.class

snowy-plugin/snowy-plugin-sys/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
 D:\huimv-garden\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\service\SysButtonService.java
 D:\huimv-garden\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\result\SysUserOwnPermissionResult.java
 D:\huimv-garden\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\result\SysUserPicValidCodeResult.java
@@ -147,3 +148,154 @@ D:\huimv-garden\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modu
 D:\huimv-garden\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\mapper\SysModuleMapper.java
 D:\huimv-garden\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\relation\provider\SysRelationApiProvider.java
 D:\huimv-garden\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\index\param\SysIndexScheduleAddParam.java
+=======
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\menu\SysMenuChangeModuleParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\param\SysRoleSelectorUserParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\index\param\SysIndexScheduleListParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserSelectorUserParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\service\impl\SysMenuServiceImpl.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\service\impl\SysRoleServiceImpl.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserMessagePageParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\result\SysUserExportResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\index\param\SysIndexScheduleIdParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\org\provider\SysOrgApiProvider.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\enums\SysUserStatusEnum.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\button\SysButtonPageParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserGrantResourceParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\controller\SysUserController.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\entity\SysRole.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\entity\SysModule.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\result\SysRoleOwnPermissionResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\enums\SysResourceCategoryEnum.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\provider\SysMenuApiProvider.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\param\SysRoleIdParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\position\param\SysPositionIdParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\mapper\SysModuleMapper.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\module\SysModuleAddParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\position\enums\SysPositionCategoryEnum.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\org\enums\SysOrgCategoryEnum.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\menu\SysMenuSelectorMenuParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\param\SysRoleEditParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\module\SysModuleEditParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserUpdatePwdParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\button\SysButtonIdParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\menu\SysMenuTreeParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\result\SysUserMessageDetailResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserGrantRoleParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\org\mapper\SysOrgMapper.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserUpdateWorkbenchParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\result\SysUserGrantResourceTreeResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\mapper\SysUserMapper.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\org\param\SysOrgEditParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\service\SysMenuService.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserImportParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\param\SysRolePageParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\index\param\SysIndexMessageListParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserGetPhoneValidCodeParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\provider\SysButtonApiProvider.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\entity\SysMenu.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\position\service\impl\SysPositionServiceImpl.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\core\config\SysConfigure.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\module\SysModulePageParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\relation\service\SysRelationService.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\index\service\impl\SysIndexServiceImpl.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\result\SysUserPositionResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\position\param\SysPositionAddParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\relation\entity\SysRelation.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\button\SysButtonEditParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\service\impl\SysButtonServiceImpl.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\result\SysRoleOwnMobileMenuResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\result\SysUserOwnResourceResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\core\enums\SysBuildInEnum.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\result\SysRoleGrantMobileMenuTreeResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\index\service\SysIndexService.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\position\param\SysPositionPageParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\param\SysRoleGrantUserParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\result\SysRoleGrantResourceTreeResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserSelectorRoleParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\org\param\SysOrgIdParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserSignatureParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\position\provider\SysPositionApiProvider.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\position\service\SysPositionService.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserMessageIdParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\provider\SysUserApiProvider.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\menu\SysMenuIdParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\index\result\SysIndexMessageDetailResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\mapper\SysRoleMapper.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\relation\mapper\SysRelationMapper.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\index\controller\SysIndexController.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\button\SysButtonAddParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\position\param\SysPositionSelectorPositionParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\provider\SysLoginUserApiProvider.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\entity\SysButton.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\org\param\SysOrgSelectorOrgListParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\index\result\SysIndexVisLogListResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserFindPwdByEmailParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\menu\SysMenuEditParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\controller\SysMenuController.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\enums\SysRoleCategoryEnum.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\enums\SysRoleDataScopeCategoryEnum.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserAddParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\relation\service\impl\SysRelationServiceImpl.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\menu\SysMenuPageParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserUpdateInfoParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\position\controller\SysPositionController.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\service\impl\SysUserServiceImpl.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\entity\SysUser.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\param\SysRoleAddParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\position\mapper\SysPositionMapper.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\mapper\SysButtonMapper.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\service\impl\SysModuleServiceImpl.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserIdListParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\index\result\SysIndexMessageListResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\core\listener\SysDataChangeListener.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\position\entity\SysPosition.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\result\SysLoginUser.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\result\SysUserResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\result\SysUserMessageResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\param\SysRoleGrantMobileMenuParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\index\param\SysIndexMessageIdParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserSelectorOrgListParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\relation\enums\SysRelationCategoryEnum.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\enums\SysResourceMenuTypeEnum.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\org\param\SysOrgAddParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\result\SysRoleOwnResourceResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\result\SysUserOwnPermissionResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\controller\SysButtonController.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserExportParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserEditParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserPageParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\param\SysRoleSelectorRoleParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\org\service\impl\SysOrgServiceImpl.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\service\SysButtonService.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\org\controller\SysOrgController.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\org\entity\SysOrg.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserGrantPermissionParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\relation\provider\SysRelationApiProvider.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\controller\SysModuleController.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserGetEmailValidCodeParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\menu\SysMenuSelectorModuleParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\org\param\SysOrgPageParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserSelectorPositionParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\mapper\SysMenuMapper.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\result\SysUserPicValidCodeResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\service\SysRoleService.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\core\enums\SysDataTypeEnum.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\param\SysRoleGrantResourceParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\org\param\SysOrgSelectorUserParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\index\result\SysIndexOpLogListResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\service\SysModuleService.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\org\service\SysOrgService.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\controller\SysRoleController.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\index\param\SysIndexScheduleAddParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserFindPwdByPhoneParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\param\SysRoleGrantPermissionParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\param\SysUserIdParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\position\param\SysPositionEditParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\module\SysModuleIdParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\controller\SysUserCenterController.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\resource\param\menu\SysMenuAddParam.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\user\service\SysUserService.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\index\result\SysIndexScheduleListResult.java
+G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-sys\src\main\java\vip\xiaonuo\sys\modular\role\provider\SysRoleApiProvider.java
+>>>>>>> Stashed changes