数据库表增加租户字段（company_id）

car-wash-admin/src/main/java/com/kym/admin/utils/MybatisPlusGeneratorForAdmin.java

@@ -8,7 +8,6 @@ import com.kym.entity.BaseEntity;
 import com.kym.mapper.mybatisplus.MyBaseMapper;
 import com.kym.service.mybatisplus.MyBaseService;
 import com.kym.service.mybatisplus.MyBaseServiceImpl;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.sql.Types;
 import java.util.Map;
@@ -22,7 +21,7 @@ public class MybatisPlusGeneratorForAdmin {
 
     public static void main(String[] args) {
         // 指定数据源
-        FastAutoGenerator.create("jdbc:mysql://121.40.98.15:3307/charge_admin", "root", "KuaiyuMan/*-")
+        FastAutoGenerator.create("jdbc:mysql://121.40.98.15:3307/car-wash-admin", "root", "KuaiyuMan/*-")
                 .globalConfig(builder -> {
                     builder.author("skyline")
                             // 指定输出目录
@@ -51,12 +50,12 @@ public class MybatisPlusGeneratorForAdmin {
                             .controller("admin.controller")
                             // 设置mapperXml生成路径
                             .pathInfo(Map.of(
-                                    OutputFile.entity, "D://快与慢充电桩/code/charge-java/entity/src/main/java/com/kym/entity/admin",
-                                    OutputFile.service, "D://快与慢充电桩/code/charge-java/service/src/main/java/com/kym/service/admin",
-                                    OutputFile.serviceImpl, "D://快与慢充电桩/code/charge-java/service/src/main/java/com/kym/service/admin/impl",
-                                    OutputFile.mapper, "D://快与慢充电桩/code/charge-java/mapper/src/main/java/com/kym/mapper/admin",
-                                    OutputFile.controller, "D://快与慢充电桩/code/charge-java/admin/src/main/java/com/kym/admin/controller",
-                                    OutputFile.xml, "D://快与慢充电桩/code/charge-java/mapper/src/main/resources/mappers/admin"
+                                    OutputFile.entity, "D://快与慢充电桩/code/car-wash-java/car-wash-entity/src/main/java/com/kym/entity/admin",
+                                    OutputFile.service, "D://快与慢充电桩/code/car-wash-java/car-wash-service/src/main/java/com/kym/service/admin",
+                                    OutputFile.serviceImpl, "D://快与慢充电桩/code/car-wash-java/car-wash-service/src/main/java/com/kym/service/admin/impl",
+                                    OutputFile.mapper, "D://快与慢充电桩/code/car-wash-java/car-wash-mapper/src/main/java/com/kym/mapper/admin",
+                                    OutputFile.controller, "D://快与慢充电桩/code/car-wash-java/car-wash-admin/src/main/java/com/kym/admin/controller",
+                                    OutputFile.xml, "D://快与慢充电桩/code/car-wash-java/car-wash-mapper/src/main/resources/mappers/admin"
 
                             ));
                 })
@@ -65,11 +64,6 @@ public class MybatisPlusGeneratorForAdmin {
                     // 设置需要生成的表名
                     builder.addInclude(
 //                            "t_equipment_info",
-//                            "t_connector_info"
-//                            "t_invoice_detail"
-//                            "t_coupon",
-//                            "t_system_notice",
-//                            "t_station_notice"
                             )
                             // 设置过滤表前缀
                             .addTablePrefix("t_");
@@ -77,7 +71,7 @@ public class MybatisPlusGeneratorForAdmin {
                     // entity配置
                     builder.entityBuilder()
                             .superClass(BaseEntity.class)
-                            .addIgnoreColumns("id","create_time","update_time")
+                            .addIgnoreColumns("id", "company_id", "create_time", "update_time")
                             .enableFileOverride()
                             .enableLombok();
 

car-wash-admin/src/main/resources/application-dev.yml

@@ -92,12 +92,12 @@ spring:
       strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
       datasource:
         db-admin:
-          url: jdbc:mysql://121.40.98.15:3307/charge_admin?serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://121.40.98.15:3307/car-wash-admin?serverTimezone=Asia/Shanghai
           username: root
           password: KuaiyuMan/*-
           driver-class-name: com.mysql.cj.jdbc.Driver
         db-miniapp:
-          url: jdbc:mysql://121.40.98.15:3307/charge_app?serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://121.40.98.15:3307/car-wash-app?serverTimezone=Asia/Shanghai
           username: root
           password: KuaiyuMan/*-
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -106,7 +106,7 @@ spring:
       port: 6380
       host: 121.40.98.15
       password: KtXA^Zx!TZmLEy(@JjB@2(TVG0kdy5)&
-      database: 10
+      database: 11
       lettuce:
         pool:
           min-idle: 1

car-wash-entity/src/main/java/com/kym/entity/BaseEntity.java

@@ -19,6 +19,11 @@ public abstract class BaseEntity<T extends BaseEntity<T>> implements Serializabl
      */
     private Long id;
 
+    /**
+     * 公司（租户）ID
+     */
+    private Long companyId;
+
     /**
      * 创建时间
      */

car-wash-entity/src/main/java/com/kym/entity/admin/AdminUser.java

@@ -30,11 +30,6 @@ public class AdminUser extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 公司id
-     */
-    private Long companyId;
-
     /**
      * 用户名
      */

car-wash-entity/src/main/java/com/kym/entity/admin/AdminUserRole.java

@@ -22,10 +22,6 @@ public class AdminUserRole extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 公司id
-     */
-    private Long companyId;
 
     /**
      * 管理平台用户id

car-wash-entity/src/main/java/com/kym/entity/admin/AdminUserStation.java

@@ -21,10 +21,6 @@ public class AdminUserStation extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 公司id
-     */
-    private Long companyId;
 
     /**
      * 操作员id

car-wash-entity/src/main/java/com/kym/entity/admin/ConnectorInfo.java

@@ -26,11 +26,6 @@ public class ConnectorInfo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 公司id
-     */
-    private Long companyId;
-
     /**
      * 站点id
      */

car-wash-entity/src/main/java/com/kym/entity/admin/EquipmentInfo.java

@@ -30,10 +30,6 @@ public class EquipmentInfo extends BaseEntity {
     public static int SERVICE_STATUS_预约中 = 4;
     public static int SERVICE_STATUS_故障 = 255;
 
-    /**
-     * 公司id
-     */
-    private Long companyId;
 
     /**
      * 站点id

car-wash-entity/src/main/java/com/kym/entity/admin/Role.java

@@ -20,11 +20,6 @@ public class Role extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 公司id
-     */
-    private Long companyId;
-
     /**
      * 父角色id
      */

car-wash-entity/src/main/java/com/kym/entity/admin/RolePermission.java

@@ -23,10 +23,6 @@ public class RolePermission extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 公司id
-     */
-    private Long companyId;
 
     /**
      * 角色id

car-wash-entity/src/main/java/com/kym/entity/admin/Station.java

@@ -34,10 +34,7 @@ public class Station extends BaseEntity implements Serializable {
     public static final int STATION_STATUS_维护中 = 6;
     public static final int STATION_STATUS_正常使用 = 50;
     private static final long serialVersionUID = 1L;
-    /**
-     * 公司id
-     */
-    private Long companyId;
+
 
     /**
      * 电站组id

car-wash-entity/src/main/java/com/kym/entity/admin/SystemLog.java

@@ -23,11 +23,6 @@ public class SystemLog extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 公司id
-     */
-    private Long companyId;
-
     /**
      * 用户id
      */

car-wash-entity/src/main/java/com/kym/entity/admin/vo/ConnectorInfoVo.java

@@ -20,11 +20,6 @@ public class ConnectorInfoVo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 公司id
-     */
-    private Long companyId;
-
     /**
      * 站点id
      */

car-wash-entity/src/main/java/com/kym/entity/admin/vo/LocalStationVo.java

@@ -32,10 +32,6 @@ public class LocalStationVo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 公司id
-     */
-    private Long companyId;
 
     /**
      * 电站组id

car-wash-entity/src/main/java/com/kym/entity/admin/vo/StationVo.java

@@ -31,11 +31,6 @@ public class StationVo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 公司id
-     */
-    private Long companyId;
-
     /**
      * 电站组id
      */

car-wash-entity/src/main/java/com/kym/entity/miniapp/AppLog.java

@@ -21,11 +21,6 @@ public class AppLog extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 公司id
-     */
-    private Long companyId;
-
     /**
      * 用户id
      */

car-wash-mapper/src/main/resources/mappers/admin/ActivityMapper.xml

@@ -4,6 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.Activity">
+        <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="name" property="name" />
         <result column="activityDesc" property="activity_desc" />
         <result column="activityDescPage" property="activity_desc_page" />
@@ -20,7 +22,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,name, activity_desc, activity_desc_page,start_time, end_time, discount_type, target_users, apply_station, allow_stacke, quantity, status, remark,create_time,update_time
+        id,company_id,name, activity_desc, activity_desc_page,start_time, end_time, discount_type, target_users, apply_station, allow_stacke, quantity, status, remark,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/ActivityStationMapper.xml

@@ -4,6 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.ActivityStation">
+        <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="activity_id" property="activityId" />
         <result column="station_id" property="stationId" />
         <result column="status" property="status" />
@@ -13,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        activity_id, station_id,status,create_time, update_time
+        id,company_id,activity_id, station_id,status,create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/AdminUserRoleMapper.xml

@@ -4,14 +4,17 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.AdminUserRole">
+        <result column="id" property="id" />
         <result column="company_id" property="companyId" />
         <result column="admin_user_id" property="adminUserId" />
         <result column="role_id" property="roleId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        company_id, admin_user_id, role_id
+        id,company_id, admin_user_id, role_id,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/AdminUserStationMapper.xml

@@ -4,15 +4,18 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.AdminUserStation">
+        <result column="id" property="id" />
         <result column="company_id" property="companyId" />
         <result column="admin_user_id" property="adminUserId" />
         <result column="station_id" property="stationId" />
         <result column="station_name" property="stationName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        company_id, admin_user_id, station_id, station_name
+        id,company_id, admin_user_id, station_id, station_name,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/BannerMapper.xml

@@ -4,6 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.Banner">
+        <result column="id" property="id" />
         <result column="activity_id" property="activityId" />
         <result column="banner_desc" property="bannerDesc" />
         <result column="banner_url" property="bannerUrl" />
@@ -12,11 +13,13 @@
         <result column="end_time" property="endTime" />
         <result column="status" property="status" />
         <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        activity_id, banner_desc, banner_url, link_url, start_time, end_time, status, remark
+        id,activity_id, banner_desc, banner_url, link_url, start_time, end_time, status, remark,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/CompanyMapper.xml

@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.Company">
         <id column="id" property="id" />
         <result column="company_name" property="companyName" />
+        <result column="company_id" property="companyId" />
         <result column="super_admin_id" property="superAdminId" />
         <result column="super_admin_name" property="superAdminName" />
         <result column="status" property="status" />
@@ -15,7 +16,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_name, super_admin_id, super_admin_name, status, create_time, update_time
+        id, company_id,company_name, super_admin_id, super_admin_name, status, create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/ContactMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.Contact">
         <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="mobile" property="mobile" />
         <result column="code_url" property="codeUrl" />
         <result column="join_us" property="joinUs" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, mobile, code_url, join_us, create_time, update_time
+        id, company_id,mobile, code_url, join_us, create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/CouponMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.Coupon">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="activity_id" property="activityId" />
         <result column="name" property="name" />
         <result column="coupon_desc" property="couponDesc" />
@@ -27,7 +28,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,activity_id,name, coupon_desc, start_time, end_time, validity,receive_type,coupon_type, min_service_money, discount, allow_stacke, quantity, claimed_quantity, used_quantity, status, remark,create_time,update_time
+        id,company_id,activity_id,name, coupon_desc, start_time, end_time, validity,receive_type,coupon_type, min_service_money, discount, allow_stacke, quantity, claimed_quantity, used_quantity, status, remark,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/EquipmentRelationMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.EquipmentRelation">
         <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="station_id" property="stationId" />
         <result column="station_name" property="stationName" />
         <result column="short_id" property="shortId" />
@@ -18,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, station_id, station_name,short_id, equipment_id,connector_id, parking_no,status, create_time, update_time
+        id, company_id,station_id, station_name,short_id, equipment_id,connector_id, parking_no,status, create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/InvestorInfoMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.InvestorInfo">
-        <result column="id" property="id" />
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="admin_user_id" property="adminUserId" />
         <result column="admin_user_name" property="adminUserName" />
         <result column="station_id" property="stationId" />
@@ -25,7 +26,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,admin_user_id, admin_user_name, station_id,station_name, vat_rate, splitting_proportion, elec_loss_proportion,account_name, telephone, bank_name, bank_card_no, status, remark,tax_no,create_time,update_time
+        id,company_id,admin_user_id, admin_user_name, station_id,station_name, vat_rate, splitting_proportion, elec_loss_proportion,account_name, telephone, bank_name, bank_card_no, status, remark,tax_no,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/InvoiceDetailMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.InvoiceDetail">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="apply_id" property="applyId" />
         <result column="fapiao_time" property="fapiaoTime" />
         <result column="status" property="status" />
@@ -25,7 +26,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,apply_id, fapiao_time, status, blue_fapiao, red_fapiao, card_information, total_amount, tax_amount, amount, seller_information, buyer_information, extra_information, items, remark,create_time,update_time
+        id,company_id,apply_id, fapiao_time, status, blue_fapiao, red_fapiao, card_information, total_amount, tax_amount, amount, seller_information, buyer_information, extra_information, items, remark,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/MonitorLogMapper.xml

@@ -4,6 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.MonitorLog">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="station_id" property="stationId" />
         <result column="type" property="type" />
         <result column="sn" property="sn" />
@@ -16,7 +18,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        station_id, type, sn, offline_time, offline_status, is_notice, is_recover, recover_time
+        id,company_id,station_id, type, sn, offline_time, offline_status, is_notice, is_recover, recover_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/PermissionMapper.xml

@@ -4,15 +4,18 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.Permission">
+        <result column="id" property="id" />
         <result column="name" property="name" />
         <result column="value" property="value" />
         <result column="pid" property="pid" />
         <result column="weight" property="weight" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        `name`, `value`, `pid`, weight
+        id,`name`, `value`, `pid`, weight, create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/RechargeRightsMapper.xml

@@ -4,6 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.RechargeRights">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="activity_id" property="activityId" />
         <result column="name" property="name" />
         <result column="rights_desc" property="rightsDesc" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,activity_id, name, rights_desc, start_time, end_time,validity, amount_min, amount_max, discount, allow_stacke, quantity, status, remark,create_time,update_time
+        id,activity_id,activity_id, name, rights_desc, start_time, end_time,validity, amount_min, amount_max, discount, allow_stacke, quantity, status, remark,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/RoleMapper.xml

@@ -4,16 +4,19 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.Role">
+        <id column="id" property="id" />
         <result column="company_id" property="companyId" />
         <result column="parent_id" property="parentId" />
         <result column="role_name" property="roleName" />
         <result column="role_desc" property="roleDesc" />
         <result column="permissions" property="permissions" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        company_id, parent_id, role_name, role_desc, permissions
+        id,company_id, parent_id, role_name, role_desc, permissions, create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/StatementsMapper.xml

@@ -4,6 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.Statements">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="admin_user_id" property="adminUserId" />
         <result column="admin_user_name" property="adminUserName" />
         <result column="station_id" property="stationId" />
@@ -30,13 +32,15 @@
         <result column="actual_splitting_amount" property="actualSplittingAmount" />
         <result column="status" property="status" />
         <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,admin_user_id, admin_user_name, station_id, station_name, start_time, end_time, total_power, actual_power, elec_loss_power,
+        id,company_id,admin_user_id, admin_user_name, station_id, station_name, start_time, end_time, total_power, actual_power, elec_loss_power,
         total_money, elec_money, actual_elec_money, elec_loss_money, service_money, discount_amount, service_money_discount,
-        actual_service_money, splitting_proportion, splitting_amount, elec_loss_proportion,elec_loss_amount,vat_rate, vat_amount, actual_splitting_amount, status, remark
+        actual_service_money, splitting_proportion, splitting_amount, elec_loss_proportion,elec_loss_amount,vat_rate, vat_amount, actual_splitting_amount, status, remark, create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/StationNoticeMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.StationNotice">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="notice_id" property="noticeId" />
         <result column="station_id" property="stationId" />
         <result column="create_time" property="createTime" />
@@ -13,7 +14,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,notice_id, station_id,create_time,update_time
+        id,company_id,notice_id, station_id,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/StationStatDayMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.StationStatDay">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="station_id" property="stationId" />
         <result column="stat_day" property="statDay" />
         <result column="charge_users" property="chargeUsers" />
@@ -25,7 +26,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,station_id, stat_day, charge_users, valid_orders, total_power, total_money, elec_money, service_money,service_money_discount,discount_amount, avg_order_elec, avg_order_money, avg_connector_elec,connector_usage_rate,create_time, update_time
+        id,company_id,station_id, stat_day, charge_users, valid_orders, total_power, total_money, elec_money, service_money,service_money_discount,discount_amount, avg_order_elec, avg_order_money, avg_connector_elec,connector_usage_rate,create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/StationStatMonthMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.StationStatMonth">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="station_id" property="stationId" />
         <result column="stat_month" property="statMonth" />
         <result column="charge_users" property="chargeUsers" />
@@ -27,7 +28,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,station_id, stat_month, charge_users, valid_orders, total_power, total_money, elec_money, service_money,service_money_discount,discount_amount, avg_order_elec, avg_order_money, avg_connector_elec,connector_usage_rate,actual_power,actual_elec_money,create_time,update_time,create_time, update_time
+        id,company_id,station_id, stat_month, charge_users, valid_orders, total_power, total_money, elec_money, service_money,service_money_discount,discount_amount, avg_order_elec, avg_order_money, avg_connector_elec,connector_usage_rate,actual_power,actual_elec_money,create_time,update_time,create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/admin/SystemNoticeMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.admin.SystemNotice">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="title" property="title" />
         <result column="content" property="content" />
         <result column="admin_user_name" property="adminUserName" />
@@ -18,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,title, content, admin_user_name, admin_user_id, start_time, end_time, status,create_time,update_time
+        id,company_id,title, content, admin_user_name, admin_user_id, start_time, end_time, status,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/AccountMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.Account">
         <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="user_id" property="userId" />
         <result column="balance" property="balance" />
         <result column="frozen_amount" property="frozenAmount" />
@@ -15,7 +16,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, balance, frozen_amount, status, create_time, update_time
+        id, company_id,user_id, balance, frozen_amount, status, create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/AppLogMapper.xml

@@ -4,6 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.AppLog">
+        <result column="id" property="id" />
         <result column="company_id" property="companyId" />
         <result column="user_id" property="userId" />
         <result column="username" property="username" />
@@ -16,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        company_id, user_id, username, ip, operation, method, request_param, execute_time
+        id,company_id, user_id, username, ip, operation, method, request_param, execute_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/AttachmentMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.Attachment">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="uuid" property="uuid" />
         <result column="name" property="name" />
         <result column="size" property="size" />
@@ -17,7 +18,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, uuid, name, size, upload_by, upload_name, is_delete, create_time, update_time
+        id, company_id,uuid, name, size, upload_by, upload_name, is_delete, create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/CarsMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.Cars">
         <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="user_id" property="userId" />
         <result column="plate_no" property="plateNo" />
         <result column="vehicle_type" property="vehicleType" />
@@ -23,7 +24,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, plate_no, vehicle_type, address, vin, use_character, model, engine_no, register_date, is_defult, is_delete, issue_date, create_time, update_time
+        id, company_id,user_id, plate_no, vehicle_type, address, vin, use_character, model, engine_no, register_date, is_defult, is_delete, issue_date, create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/ChargeOrderMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.ChargeOrder">
         <id column="id" property="id"/>
+        <result column="company_id" property="companyId" />
         <result column="user_id" property="userId"/>
         <result column="station_id" property="stationId"/>
         <result column="start_charge_seq" property="startChargeSeq"/>
@@ -72,7 +73,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, station_id, start_charge_seq, connector_id, is_booking,start_time, end_time, soc, total_power, total_money, elec_money, service_money,pay_amount,discount_type,discount_amount,service_money_discount, sum_period, charge_detail, order_status, charge_status, stop_reason, invoice_status,invoice_id,create_time, update_time
+        id, company_id,user_id, station_id, start_charge_seq, connector_id, is_booking,start_time, end_time, soc, total_power, total_money, elec_money, service_money,pay_amount,discount_type,discount_amount,service_money_discount, sum_period, charge_detail, order_status, charge_status, stop_reason, invoice_status,invoice_id,create_time, update_time
     </sql>
 
     <select id="statChargeOrders" resultType="java.util.Map"

car-wash-mapper/src/main/resources/mappers/miniapp/CollectMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.Collect">
         <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="user_id" property="userId" />
         <result column="station_id" property="stationId" />
         <result column="status" property="status" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, station_id, status, create_time, update_time
+        id, company_id,user_id, station_id, status, create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/CollectionMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.Collect">
         <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="user_id" property="userId" />
         <result column="station_id" property="stationId" />
         <result column="status" property="status" />
@@ -14,7 +15,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, station_id, status, create_time, update_time
+        id, company_id,user_id, station_id, status, create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/DataDictMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.DataDict">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="code" property="code" />
         <result column="name" property="name" />
         <result column="value" property="value" />
@@ -16,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, code, name, value, weight,remark, create_time, update_time
+        id, company_id,code, name, value, weight,remark, create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/InvoiceMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.Invoice">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="applyId" property="applyId" />
         <result column="user_id" property="userId" />
         <result column="openid" property="openid" />
@@ -32,7 +33,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,apply_id,user_id, openid,order_details, total_power, total_money, elec_money, service_money, email,phone, invoice_type, invoice_title, tax_id, address, bank_name, bank_account, invoice_amount, tax_info, biller, status,remark,create_time,update_time
+        id,company_id,apply_id,user_id, openid,order_details, total_power, total_money, elec_money, service_money, email,phone, invoice_type, invoice_title, tax_id, address, bank_name, bank_account, invoice_amount, tax_info, biller, status,remark,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/InvoiceTitleMapper.xml

@@ -4,6 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.InvoiceTitle">
+        <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="user_id" property="userId" />
         <result column="email" property="email" />
         <result column="phone" property="phone" />
@@ -18,7 +20,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,user_id, email, phone, invoice_type, invoice_title, tax_id, address, bank_name, bank_account, remark,create_time,update_time
+        id,company_id,user_id, email, phone, invoice_type, invoice_title, tax_id, address, bank_name, bank_account, remark,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/MpMsgTemplateMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.MpMsgTemplate">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="template_id" property="templateId" />
         <result column="title" property="title" />
         <result column="primary_industry" property="primaryIndustry" />
@@ -18,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,template_id, title, primary_industry, deputy_industry, content, example,page_path,create_time,update_time
+        id,company_id,template_id, title, primary_industry, deputy_industry, content, example,page_path,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/MpRelationMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.MpRelation">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="user_id" property="userId" />
         <result column="openid" property="openid" />
         <result column="mp_openid" property="mpOpenid" />
@@ -17,7 +18,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,user_id, openid, mp_openid, unionid, subscribe, subscribe_scene,create_time,update_time
+        id,company_id,user_id, openid, mp_openid, unionid, subscribe, subscribe_scene,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/OrderCouponMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.OrderCoupon">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="coupon_id" property="couponId" />
         <result column="activity_id" property="activityId" />
         <result column="user_coupon_id" property="userCouponId" />
@@ -20,7 +21,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,coupon_id, activity_id, user_coupon_id, user_id, start_charge_seq, coupon_type, discount, discount_amount,status,create_time,update_time
+        id,company_id,coupon_id, activity_id, user_coupon_id, user_id, start_charge_seq, coupon_type, discount, discount_amount,status,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/OrderRechargeRightsMapper.xml

@@ -4,17 +4,21 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.OrderRechargeRights">
+        <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="rights_id" property="rightsId" />
         <result column="activity_id" property="activityId" />
         <result column="user_id" property="userId" />
         <result column="start_charge_seq" property="startChargeSeq" />
         <result column="discount" property="discount" />
         <result column="discount_amount" property="discountAmount" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,rights_id, activity_id, user_id, start_charge_seq, discount, discount_amount,create_time,update_time
+        id,company_id,rights_id, activity_id, user_id, start_charge_seq, discount, discount_amount,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/PayLogMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.PayLog">
         <id column="id" property="id"/>
+        <result column="company_id" property="companyId" />
         <result column="user_id" property="userId"/>
         <result column="openid" property="openid"/>
         <result column="bank_type" property="bankType"/>
@@ -37,7 +38,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, openid, bank_type, mch_id, out_trade_no, transaction_id, success_time, trade_type, trade_state, attach, total, currency, payer_total, payer_currency, create_time, update_time
+        id, company_id,user_id, openid, bank_type, mch_id, out_trade_no, transaction_id, success_time, trade_type, trade_state, attach, total, currency, payer_total, payer_currency, create_time, update_time
     </sql>
 
     <select id="listRecharge" parameterType="com.kym.entity.admin.queryParams.CommonQueryParam"

car-wash-mapper/src/main/resources/mappers/miniapp/QuestionAnswerMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.QuestionAnswer">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="question" property="question" />
         <result column="answer" property="answer" />
         <result column="sort" property="sort" />
@@ -15,7 +16,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,question, answer, sort, is_delete,create_time,update_time
+        id,company_id,question, answer, sort, is_delete,create_time,update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/RefundLogMapper.xml

@@ -4,6 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.RefundLog">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="user_id" property="userId" />
         <result column="refund_id" property="refundId" />
         <result column="out_refund_no" property="outRefundNo" />
@@ -47,7 +49,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,user_id, refund_id, out_refund_no, transaction_id, out_trade_no, channel, user_received_account, success_time, status, funds_account, total, refund, discount_amount,currency,reason,admin_user_id,admin_username,create_time,update_time
+        id,company_id,user_id, refund_id, out_refund_no, transaction_id, out_trade_no, channel, user_received_account, success_time, status, funds_account, total, refund, discount_amount,currency,reason,admin_user_id,admin_username,create_time,update_time
     </sql>
 
 

car-wash-mapper/src/main/resources/mappers/miniapp/UserCouponMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.UserCoupon">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="coupon_id" property="couponId" />
         <result column="coupon_name" property="couponName" />
         <result column="activity_id" property="activityId" />
@@ -27,7 +28,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,oupon_id, activity_id, user_id, start_time, end_time, validity,receive_type,coupon_type, discount, min_service_money, allow_stacke, status, usage_status,remark,create_time,update_time
+        id,company_id,coupon_id, activity_id, user_id, start_time, end_time, validity,receive_type,coupon_type, discount, min_service_money, allow_stacke, status, usage_status,remark,create_time,update_time
     </sql>
 
     <select id="listStationAvailableCoupons" resultMap="BaseResultMap" parameterType="java.util.Map" >

car-wash-mapper/src/main/resources/mappers/miniapp/UserMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.User">
         <id column="id" property="id"/>
+        <result column="company_id" property="companyId" />
         <result column="openid" property="openid"/>
         <result column="unionid" property="unionid"/>
         <result column="username" property="username"/>
@@ -37,7 +38,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, openid, unionid, username, password, gender, nickname, mobile_phone, avatar, status, create_time, update_time, last_login_time
+        id, company_id,openid, unionid, username, password, gender, nickname, mobile_phone, avatar, status, create_time, update_time, last_login_time
     </sql>
 
 

car-wash-mapper/src/main/resources/mappers/miniapp/UserRechargeRightsMapper.xml

@@ -4,6 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.UserRechargeRights">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="rights_id" property="rightsId" />
         <result column="activity_id" property="activityId" />
         <result column="user_id" property="userId" />
@@ -17,11 +19,13 @@
         <result column="times" property="times" />
         <result column="status" property="status" />
         <result column="remark" property="remark" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,rights_id, activity_id, user_id, start_time, end_time, rights_balance, frozen_balance, discount, allow_stacke, discount_amount, times, status, remark,create_time,update_time
+        id,company_id,rights_id, activity_id, user_id, start_time, end_time, rights_balance, frozen_balance, discount, allow_stacke, discount_amount, times, status, remark,create_time,update_time
     </sql>
 
     <select id="listStationAvailableRights" resultMap="BaseResultMap" parameterType="java.util.Map" >

car-wash-mapper/src/main/resources/mappers/miniapp/UserStationMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.UserStation">
         <result column="id" property="id" />
+        <result column="company_id" property="companyId" />
         <result column="user_id" property="userId" />
         <result column="station_id" property="stationId" />
         <result column="mobile_phone" property="mobilePhone" />
@@ -15,7 +16,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, station_id, mobile_phone, total_power,create_time, update_time
+        id, company_id,user_id, station_id, mobile_phone, total_power,create_time, update_time
     </sql>
 
 </mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/WalletDetailMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.WalletDetail">
         <id column="id" property="id"/>
+        <result column="company_id" property="companyId" />
         <result column="user_id" property="userId"/>
         <result column="type" property="type"/>
         <result column="current" property="current"/>
@@ -22,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, type, currency, order_no, amount, commission, transaction_id, transaction_time, status, remark, create_time, update_time
+        id, company_id,user_id, type, currency, order_no, amount, commission, transaction_id, transaction_time, status, remark, create_time, update_time
     </sql>
 
 

car-wash-miniapp/src/main/java/com/kym/miniapp/utils/MybatisPlusGeneratorForMiniApp.java

@@ -21,7 +21,7 @@ public class MybatisPlusGeneratorForMiniApp {
 
     public static void main(String[] args) {
         // 指定数据源
-        FastAutoGenerator.create("jdbc:mysql://121.40.98.15:3307/charge_app", "root", "KuaiyuMan/*-")
+        FastAutoGenerator.create("jdbc:mysql://121.40.98.15:3307/car-wash-app", "root", "KuaiyuMan/*-")
                 .globalConfig(builder -> {
                     builder.author("skyline")
                             // 指定输出目录
@@ -50,12 +50,12 @@ public class MybatisPlusGeneratorForMiniApp {
                             .controller("miniapp.controller")
                             // 设置mapperXml生成路径
                             .pathInfo(Map.of(
-                                    OutputFile.entity, "D://快与慢充电桩/code/charge-java/entity/src/main/java/com/kym/entity/miniapp",
-                                    OutputFile.service, "D://快与慢充电桩/code/charge-java/service/src/main/java/com/kym/service/miniapp",
-                                    OutputFile.serviceImpl, "D://快与慢充电桩/code/charge-java/service/src/main/java/com/kym/service/miniapp/impl",
-                                    OutputFile.mapper, "D://快与慢充电桩/code/charge-java/mapper/src/main/java/com/kym/mapper/miniapp",
-                                    OutputFile.controller, "D://快与慢充电桩/code/charge-java/miniapp/src/main/java/com/kym/miniapp/controller",
-                                    OutputFile.xml, "D://快与慢充电桩/code/charge-java/mapper/src/main/resources/mappers/miniapp"
+                                    OutputFile.entity, "D://快与慢充电桩/code/car-wash-java/car-wash-entity/src/main/java/com/kym/entity/miniapp",
+                                    OutputFile.service, "D://快与慢充电桩/code/car-wash-java/car-wash-service/src/main/java/com/kym/service/miniapp",
+                                    OutputFile.serviceImpl, "D://快与慢充电桩/code/car-wash-java/car-wash-service/src/main/java/com/kym/service/miniapp/impl",
+                                    OutputFile.mapper, "D://快与慢充电桩/code/car-wash-java/car-wash-mapper/src/main/java/com/kym/mapper/miniapp",
+                                    OutputFile.controller, "D://快与慢充电桩/code/car-wash-java/car-wash-miniapp/src/main/java/com/kym/miniapp/controller",
+                                    OutputFile.xml, "D://快与慢充电桩/code/car-wash-java/car-wash-mapper/src/main/resources/mappers/miniapp"
 
                             ));
                 })
@@ -64,17 +64,6 @@ public class MybatisPlusGeneratorForMiniApp {
                     // 设置需要生成的表名
                     builder.addInclude(
 //                                    "t_user",
-//                                    "t_account"
-//                                    "t_charge_order",
-//                                    "t_wallet_detail",
-//                                    "t_cars",
-//                                    "t_collect",
-//                            "t_pay_log"
-//                            "t_user_coupon"
-//                            "t_order_coupon"
-//                            "t_mp_relation"
-//                            "t_mp_msg_template"
-//                            "t_user_station"
                             )
                             // 设置过滤表前缀
                             .addTablePrefix("t_");
@@ -82,7 +71,7 @@ public class MybatisPlusGeneratorForMiniApp {
                     // entity配置
                     builder.entityBuilder()
                             .superClass(BaseEntity.class)
-                            .addIgnoreColumns("id", "create_time", "update_time")
+                            .addIgnoreColumns("id", "company_id", "create_time", "update_time")
                             .enableFileOverride()
                             .enableLombok();
 

car-wash-miniapp/src/main/resources/application-dev.yml

@@ -85,12 +85,12 @@ spring:
       strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
       datasource:
         db-admin:
-          url: jdbc:mysql://121.40.98.15:3307/charge_admin?tinyInt1isBit=false&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://121.40.98.15:3307/car-wash-admin?serverTimezone=Asia/Shanghai
           username: root
           password: KuaiyuMan/*-
           driver-class-name: com.mysql.cj.jdbc.Driver
         db-miniapp:
-          url: jdbc:mysql://121.40.98.15:3307/charge_app
+          url: jdbc:mysql://121.40.98.15:3307/car-wash-app?serverTimezone=Asia/Shanghai
           username: root
           password: KuaiyuMan/*-
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -99,7 +99,7 @@ spring:
       port: 6380
       host: 121.40.98.15
       password: KtXA^Zx!TZmLEy(@JjB@2(TVG0kdy5)&
-      database: 10
+      database: 11
       lettuce:
         pool:
           min-idle: 1
@@ -131,4 +131,4 @@ spring:
           multiplier: 2
 
 kym:
-  notify-email: skyline@kuaiyuman.cn
+  notify-email: skyline@kuaiyuman.cn