fix (farm): 首页,生产计划,微信登录

- 网箱编号规则 重构
- 微信登录,租户列表返回套餐信息

yudao-module-farm/src/main/resources/mapper/inputlibrary/InputUsageRecordsMapper.xml

@@ -55,6 +55,8 @@
         ffr.id AS farmRecordId,
         ffr.base_name AS baseName,
         ffr.plot_name AS plotName,
+        ffr.task_type AS taskTypeId,
+        ffr.task_name AS taskNameId,
         ffr.task_scope AS planNumber,
         ffr.task_start_date AS taskStartDate,
         ffr.task_end_date AS taskEndDate,
@@ -84,10 +86,12 @@
         ffr.id,
         ffr.base_name,
         ffr.plot_name,
+        ffr.task_type,
+        ffr.task_name,
         ffr.task_scope,
         ffr.task_start_date,
         ffr.task_end_date
-        ORDER BY ffr.task_start_date DESC
+        ORDER BY inputTotalPrice DESC
     </select>
 
     <select id="getInputUsageByTypeChart"

yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanUsedGridMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.farm.dal.mysql.productionplan.ProductionPlanUsedGridMapper">
+
+
+
+</mapper>