Merge remote-tracking branch 'origin/store-plantform' into store-plantform

alien-entity/src/main/java/shop/alien/mapper/storePlantform/StoreLicenseHistoryMapper.java

@@ -24,7 +24,7 @@ public interface StoreLicenseHistoryMapper extends BaseMapper<StoreLicenseHistor
      * @param deleteFlag 删除标记（0-未删除，1-已删除）
      * @return 证照历史记录列表
      */
-    @Select("SELECT * FROM store_license_history WHERE store_id = #{storeId} AND license_status = #{licenseStatus} AND delete_flag = #{deleteFlag} ORDER BY created_time DESC")
+    @Select("SELECT * FROM store_license_history WHERE store_id = #{storeId} AND license_status = #{licenseStatus} AND (delete_flag = #{deleteFlag} or license_execute_status = 2) ORDER BY created_time DESC")
     List<StoreLicenseHistory> queryLicenceByStatusList(@Param("storeId") Integer storeId, 
                                                         @Param("licenseStatus") Integer licenseStatus, 
                                                         @Param("deleteFlag") Integer deleteFlag);