Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/FeishuSend.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2023-03-02
+ * @since 2023-03-07
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -45,6 +45,12 @@ public class FeishuSend extends Model<FeishuSend> {
     @TableField("template_variable")
     private String templateVariable;
 
+    /**
+     * 公司id
+     */
+    @TableField("company_id")
+    private Integer companyId;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/FeishuSendMapper.xml

@@ -8,11 +8,12 @@
         <result column="template_name" property="templateName" />
         <result column="template_id" property="templateId" />
         <result column="template_variable" property="templateVariable" />
+        <result column="company_id" property="companyId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, template_name, template_id, template_variable
+        id, template_name, template_id, template_variable, company_id
     </sql>
 
 </mapper>